diff options
| author | Oleg Yadrov <oleg.yadrov@qt.io> | 2017-01-12 10:03:10 -0800 |
|---|---|---|
| committer | Oleg Yadrov <oleg.yadrov@qt.io> | 2017-03-04 00:43:50 +0000 |
| commit | ad5565b6438cb239ad36722605a31b1006cd6478 (patch) | |
| tree | 9039c0113bbba5256eabdbc5f27cd8b7f1015b34 /src/widgets/widgets/qmenu_p.h | |
| parent | d46afc24c177642734ed7a228fc6d3a0d7fa429f (diff) | |
Wide QMenu: fix size and position
This patch fixes 2 issues related to wide menus:
1) Menu took on full screen height when menu width was larger than
screen width;
2) On a multi-display system wide menu might appear on wrong monitor
(not the one where show event was triggered).
The idea is we limit parent menu and all its submenus within the screen
where it was opened.
Note that this patch fixes only geometry-related issues and there are
also some style flaws which need to be addressed (for example, currently
the text does not elide if it doesn’t fit to the menu’s width).
Task-number: QTBUG-56917
Change-Id: I7e9ff4a48bf03060d76e34d33a13ad6cc890c133
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu_p.h')
| -rw-r--r-- | src/widgets/widgets/qmenu_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 64291e842f..898fa3161b 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -311,7 +311,6 @@ public: mutable uint ncols : 4; //4 bits is probably plenty uint collapsibleSeparators : 1; uint toolTipsVisible : 1; - QSize adjustMenuSizeForScreen(const QRect & screen); int getLastVisibleAction() const; bool activationRecursionGuard; |