Implement workaround for QTBUG-131786

mpvqc · Feb 2, 2025 · 1698b98 · 1698b98
1 parent e97ee3f
commit 1698b98
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/qml/app/MpvqcApplication.qml b/qml/app/MpvqcApplication.qml
@@ -161,7 +161,12 @@ ApplicationWindow {
         propagateComposedEvents: true
 
         onPressed: event => {
-            event.accepted = false;
+            // *********************************************************
+            // fixme: Workaround QTBUG-131786 to fake modal behavior on Windows
+            event.accepted = !!root.nativePopupOpen;
+            // *********************************************************
+
+            // event.accepted = false;
             root.focusCommentTable();
         }
     }
@@ -183,4 +188,25 @@ ApplicationWindow {
 
     Material.background: root.mpvqcTheme.background
     Material.foreground: root.mpvqcTheme.foreground
+
+    // *********************************************************
+    // fixme: Workaround QTBUG-131786 to fake modal behavior on Windows
+    property bool nativePopupOpen: false
+    property Timer modalFaker: Timer {
+        interval: 100
+        onTriggered: { root.nativePopupOpen = false; }
+    }
+
+    function enableFakeModal(): void {
+        if (Qt.platform.os === "windows") {
+            root.nativePopupOpen = true;
+        }
+    }
+
+    function disableFakeModal(): void {
+        if (Qt.platform.os === "windows") {
+            modalFaker.restart();
+        }
+    }
+    // *********************************************************
 }
diff --git a/qml/shared/MpvqcMenu.qml b/qml/shared/MpvqcMenu.qml
@@ -50,4 +50,9 @@ Menu {
         return item instanceof MenuSeparator;
     }
 
+    // *********************************************************
+    // fixme: Workaround QTBUG-131786 to fake modal behavior on Windows
+    onAboutToShow: enableFakeModal();
+    onAboutToHide: disableFakeModal();
+    // *********************************************************
 }