diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/widgets/qlistbox.cpp | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/widgets/qlistbox.cpp')
| -rw-r--r-- | src/widgets/qlistbox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index f5e0057..1083cab 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -2191,7 +2191,7 @@ void QListBox::mouseReleaseEvent( QMouseEvent *e ) } QListBoxItem * i = itemAt( e->pos() ); - bool emitClicked = d->mousePressColumn != -1 && d->mousePressRow != -1 || !d->pressedItem; + bool emitClicked = ( d->mousePressColumn != -1 && d->mousePressRow != -1 ) || !d->pressedItem; emitClicked = emitClicked && d->pressedItem == i; d->pressedItem = 0; d->mousePressRow = -1; @@ -2261,7 +2261,7 @@ void QListBox::mouseMoveEvent( QMouseEvent *e ) // move outside the listbox without having seen a press, discard // it. if ( !QRect( 0, 0, visibleWidth(), visibleHeight() ).contains( e->pos() ) && - ( d->mousePressColumn < 0 && d->mousePressRow < 0 || + ( (d->mousePressColumn < 0 && d->mousePressRow < 0) || (e->state() == NoButton && !d->pressedItem) ) ) return; @@ -4647,7 +4647,7 @@ void QListBox::selectRange( QListBoxItem *from, QListBoxItem *to, bool invert, b } } else { bool sel = !i->s; - if ( (bool)i->s != sel && sel && i->isSelectable() || !sel ) { + if ( ( (bool)i->s != sel && sel && i->isSelectable() ) || !sel ) { i->s = sel; changed = TRUE; updateItem( i ); |