whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Gatis Paeglis 2017-07-18 16:21:50 +02:00
parent 0f30dcaea8
commit f2c0fead18
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/widgets/qmenu.cpp
View File

@ -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)