From c1ce854d745b28e2f14057d29e726b8327034e9b Mon Sep 17 00:00:00 2001 From: miniak Date: Wed, 7 Apr 2010 11:01:03 +0200 Subject: fix QMenu::popup() Merge-request: 551 Reviewed-by: Benjamin Poulain --- src/gui/widgets/qmenu.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 404d46e..42f3a15 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -1913,10 +1913,9 @@ void QMenu::popup(const QPoint &p, QAction *atAction) pos.setX(screen.left() + desktopFrame); } if (pos.y() + size.height() - 1 > screen.bottom() - desktopFrame) { - if(snapToMouse) - pos.setY(qMin(mouse.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1)); - else - pos.setY(qMax(p.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1)); + const int bestPos = (snapToMouse ? mouse.y() : p.y()) - desktopFrame - size.height() + 1; + const int fallbackPos = screen.bottom() - desktopFrame - size.height() + 1; + pos.setY(qMin(bestPos, fallbackPos)); } else if (pos.y() < screen.top() + desktopFrame) { pos.setY(screen.top() + desktopFrame); } -- cgit v0.12