diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/widgets/qpopupmenu.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qpopupmenu.cpp')
| -rw-r--r-- | src/widgets/qpopupmenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index 76605be88..c52878679 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -652,19 +652,19 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint ) int hGuess = tqApp->reverseLayout() ? TQEffects::LeftScroll : TQEffects::RightScroll; int vGuess = TQEffects::DownScroll; if ( tqApp->reverseLayout() ) { - if ( snapToMouse && ( x + w/2 > mouse.x() ) || + if ( ( snapToMouse && ( x + w/2 > mouse.x() ) ) || ( parentMenu && parentMenu->isPopupMenu && ( x + w/2 > ((TQPopupMenu*)parentMenu)->x() ) ) ) hGuess = TQEffects::RightScroll; } else { - if ( snapToMouse && ( x + w/2 < mouse.x() ) || + if ( ( snapToMouse && ( x + w/2 < mouse.x() ) ) || ( parentMenu && parentMenu->isPopupMenu && ( x + w/2 < ((TQPopupMenu*)parentMenu)->x() ) ) ) hGuess = TQEffects::LeftScroll; } #ifndef QT_NO_MENUBAR - if ( snapToMouse && ( y + h/2 < mouse.y() ) || + if ( ( snapToMouse && ( y + h/2 < mouse.y() ) ) || ( parentMenu && parentMenu->isMenuBar && ( y + h/2 < ((TQMenuBar*)parentMenu)->mapToGlobal( ((TQMenuBar*)parentMenu)->pos() ).y() ) ) ) vGuess = TQEffects::UpScroll; |