MenuBar: Fix mouse interaction

Used the same pattern as earlier with Menu.

Change-Id: Id7a2d791516ba6d827e90c3b3e11f97dd326ccd5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/controls/qtmenupopupwindow.cpp b/src/controls/qtmenupopupwindow.cpp
index dcb15d22..f690fa91 100644
--- a/src/controls/qtmenupopupwindow.cpp
+++ b/src/controls/qtmenupopupwindow.cpp
@@ -134,14 +134,14 @@ void QtMenuPopupWindow::mouseReleaseEvent(QMouseEvent *e)
 
 void QtMenuPopupWindow::forwardEventToTransientParent(QMouseEvent *e)
 {
-    QWindow *parentMenuWindow = qobject_cast<QtMenuPopupWindow*>(transientParent());
-    if (!parentMenuWindow) {
-        if (m_mouseMoved && e->type() == QEvent::MouseButtonRelease)
-            dismissMenu();
-    } else {
-        QPoint parentPos = parentMenuWindow->mapFromGlobal(mapToGlobal(e->pos()));
+    if (!qobject_cast<QtMenuPopupWindow*>(transientParent())
+        && m_mouseMoved && e->type() == QEvent::MouseButtonRelease) {
+        // Clicked outside any menu
+        dismissMenu();
+    } else if (transientParent()) {
+        QPoint parentPos = transientParent()->mapFromGlobal(mapToGlobal(e->pos()));
         QMouseEvent pe = QMouseEvent(e->type(), parentPos, e->button(), e->buttons(), e->modifiers());
-        QGuiApplication::sendEvent(parentMenuWindow, &pe);
+        QGuiApplication::sendEvent(transientParent(), &pe);
     }
 }