diff options
| author | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-18 12:50:32 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@digia.com> | 2014-09-18 16:13:00 +0200 |
| commit | 1c40734f87fa10934d7cee430027b478c2ceaf58 (patch) | |
| tree | 2bace588619393f91323659420a399001ab0db68 /src/controls/qquickmenu.cpp | |
| parent | 5578b07cc65a3e7cf1cc8fe7d6232844f98202b1 (diff) | |
| download | qtquickcontrols-1c40734f87fa10934d7cee430027b478c2ceaf58.tar.gz | |
qquickmenu: implement support for __closeMenu when using native menus
Change-Id: I6ba0924d0dd90b87426f4315bd36496cbd4ad7f5
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/controls/qquickmenu.cpp')
| -rw-r--r-- | src/controls/qquickmenu.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index f96a326e..2bcd0244 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -453,8 +453,11 @@ QRect QQuickMenu::popupGeometry() const void QQuickMenu::__closeMenu() { setPopupVisible(false); - if (m_popupWindow) + if (m_platformMenu) + m_platformMenu->setVisible(false); + else if (m_popupWindow) m_popupWindow->setVisible(false); + m_parentWindow = 0; emit __menuClosed(); } |