diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2020-06-16 12:30:42 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-17 04:57:21 +0000 |
| commit | 4edef1a89fdc7f1070d64203f2ba468eab255856 (patch) | |
| tree | f9631294cbda6c692e4784d2a89f8f242ea07031 /src/widgets/widgets/qmenu.cpp | |
| parent | 8f088c9f82f7db089f62add74e1fe2ac8da55cd3 (diff) | |
Always show a submenu on its parent menu's screen
QWidget::screen() was added in b455a863a1df61337f36f2e8b43101ca21514697
and this is another good use for it (in 5.15 and newer).
Amends c068edcecf6876c7b57abbe302ad8b1347e4445e
Fixes: QTCREATORBUG-24195
Task-number: QTBUG-76162
Change-Id: Ifaafe9b45fafaae220da54bbf3bc7a568e7953f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 0a2e3ce85ce788b8a07380a458faf4ed3817d0c0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index d295f20a79..ab933c987f 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -2385,7 +2385,7 @@ void QMenuPrivate::popup(const QPoint &p, QAction *atAction, PositionFunction po } else if (QMenu *parentMenu = qobject_cast<QMenu *>(parent)) { // a submenu is always opened from an open parent menu, // so show it on the same screen where the parent is. (QTBUG-76162) - if (setScreen(QMenuPrivate::get(parentMenu)->windowHandle()->screen())) + if (setScreen(parentMenu->screen())) itemsDirty = true; screenSet = true; } |