diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/widgets/qheader.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/qheader.cpp')
| -rw-r--r-- | src/widgets/qheader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp index 82fd012..a22e299 100644 --- a/src/widgets/qheader.cpp +++ b/src/widgets/qheader.cpp @@ -602,10 +602,10 @@ void QHeader::keyPressEvent( QKeyEvent *e ) repaint( sRect( handleIdx ) ); emit pressed( d->i2s[i] ); } - } else if ( orientation() == Horizontal && - (e->key() == Key_Right || e->key() == Key_Left) - || orientation() == Vertical && - (e->key() == Key_Up || e->key() == Key_Down) ) { + } else if ( ( orientation() == Horizontal && + (e->key() == Key_Right || e->key() == Key_Left) ) + || ( orientation() == Vertical && + (e->key() == Key_Up || e->key() == Key_Down) ) ) { int dir = e->key() == Key_Right || e->key() == Key_Down ? 1 : -1; int s = d->i2s[i]; if ( e->state() & ControlButton && d->resize[s] ) { @@ -1638,8 +1638,8 @@ void QHeader::paintEvent( QPaintEvent *e ) style().drawPrimitive( QStyle::PE_FocusRect, &p, fr, colorGroup() ); } - if ( orient == Horizontal && r. right() >= e->rect().right() || - orient == Vertical && r. bottom() >= e->rect().bottom() ) + if ( ( orient == Horizontal && r. right() >= e->rect().right() ) || + ( orient == Vertical && r. bottom() >= e->rect().bottom() ) ) return; } } |