[PlasmaComponents Menu] Add ungrabMouseHack

Ensures the PlasmaComponents.Menu doesn't confuse MouseArea states.

Differential Revision: https://phabricator.kde.org/D8445

src/declarativeimports/plasmacomponents/qmenu.cpp

@@ -24,6 +24,8 @@
 #include <QQuickWindow>
 #include <QQuickItem>
 #include <QScreen>
+#include <QTimer>
+#include <QVersionNumber>
 
 #include <KAcceleratorManager>
 
@@ -424,18 +426,29 @@ Q_INVOKABLE void QMenuProxy::openRelative()
 
 void QMenuProxy::openInternal(QPoint pos)
 {
-    QQuickItem *parentItem = nullptr;
+    QQuickItem *parentItem = this->parentItem();
-
-    if (m_visualParent) {
-        parentItem = qobject_cast<QQuickItem *>(m_visualParent.data());
-    } else {
-        parentItem = qobject_cast<QQuickItem *>(parent());
-    }
 
     if (parentItem && parentItem->window()) {
         //create the QWindow
         m_menu->winId();
         m_menu->windowHandle()->setTransientParent(parentItem->window());
+
+        // Workaround for QTBUG-59044
+        auto ungrabMouseHack = [this]() {
+            QQuickItem *parentItem = this->parentItem();
+            if (parentItem && parentItem->window() && parentItem->window()->mouseGrabberItem()) {
+                parentItem->window()->mouseGrabberItem()->ungrabMouse();
+            }
+        };
+
+        //pre 5.8.0 QQuickWindow code is "item->grabMouse(); sendEvent(item, mouseEvent)"
+        //post 5.8.0 QQuickWindow code is sendEvent(item, mouseEvent); item->grabMouse()
+        if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
+            QTimer::singleShot(0, this, ungrabMouseHack);
+        } else {
+            ungrabMouseHack();
+        }
+        //end workaround
     }
 
     m_menu->popup(pos);
@@ -443,6 +456,15 @@ void QMenuProxy::openInternal(QPoint pos)
     emit statusChanged();
 }
 
+QQuickItem *QMenuProxy::parentItem() const
+{
+    if (m_visualParent) {
+        return qobject_cast<QQuickItem *>(m_visualParent.data());
+    }
+
+    return qobject_cast<QQuickItem *>(parent());
+}
+
 void QMenuProxy::close()
 {
     m_menu->hide();

src/declarativeimports/plasmacomponents/qmenu.h

@@ -184,6 +184,7 @@ private Q_SLOTS:
 private:
     void rebuildMenu();
     void openInternal(QPoint pos);
+    QQuickItem *parentItem() const;
 
     QList<QMenuItem *> m_items;
     QMenu *m_menu;