diff options
| author | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-07-18 16:21:50 +0200 |
|---|---|---|
| committer | Gatis Paeglis <gatis.paeglis@qt.io> | 2017-07-19 08:17:35 +0000 |
| commit | f2c0fead1864443d16eb0b04cd973f0955b27f7e (patch) | |
| tree | e18a7c243d5bce235813d52f82b35a1beeacd86a /src/widgets/widgets/qmenu.cpp | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
widgets: remove redundant check in QMenu::popup
if (A)
doA()
else if (B)
doB()
if (B)
doB()
is equal to:
if (A)
doA()
if (B)
doB()
when doB() is a self-contained basic operation like
QRect::setY(int ay) with { y1 = ay; } as body.
Change-Id: I3421493fe47459bd9b3d4cb5f4cfdd30ce566003
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 1b8409dba2..0d34121597 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -2430,8 +2430,6 @@ void QMenu::popup(const QPoint &p, QAction *atAction) 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)); - } else if (pos.y() < screen.top() + desktopFrame) { - pos.setY(screen.top() + desktopFrame); } if (pos.y() < screen.top() + desktopFrame) |