fix: can not click popup menu

also remove useless code in popup sync: vioken/waylib#265
linuxdeepin · Jan 16, 2024 · eba72f7 · eba72f7
1 parent 649f617
commit eba72f7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/treeland/quick/qml/StackWorkspace.qml b/src/treeland/quick/qml/StackWorkspace.qml
@@ -217,7 +217,7 @@ Item {
             }
             padding: 0
             background: null
-            closePolicy: Popup.CloseOnPressOutside
+            closePolicy: Popup.NoAutoClose
 
             XdgSurface {
                 id: popupSurfaceItem
@@ -237,11 +237,6 @@ Item {
                     }
                 }
             }
-
-            onClosed: {
-                if (waylandSurface)
-                    waylandSurface.surface.unmap()
-            }
         }
     }
 

diff --git a/src/treeland/quick/qml/TiledWorkspace.qml b/src/treeland/quick/qml/TiledWorkspace.qml
@@ -180,7 +180,7 @@ Item {
                 }
                 padding: 0
                 background: null
-                closePolicy: Popup.CloseOnPressOutside
+                closePolicy: Popup.NoAutoClose
 
                 XdgSurface {
                     id: popupSurfaceItem
@@ -200,11 +200,6 @@ Item {
                         }
                     }
                 }
-
-                onClosed: {
-                    if (waylandSurface)
-                        waylandSurface.surface.unmap()
-                }
             }
         }
 

diff --git a/src/treeland/quick/utils/helper.cpp b/src/treeland/quick/utils/helper.cpp
@@ -6,6 +6,7 @@
 #include <WServer>
 #include <WOutput>
 #include <WSurfaceItem>
+#include <wxdgsurface.h>
 
 #include <qwbackend.h>
 #include <qwdisplay.h>
@@ -383,10 +384,16 @@ bool Helper::afterHandleEvent(WSeat *seat, WSurface *watched, QObject *surfaceIt
 
     if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::TouchBegin) {
         // surfaceItem is qml type: XdgSurfaceItem or LayerSurfaceItem
-        auto toplevelSurface = qvariant_cast<WToplevelSurface*>(surfaceItem->property("surface"));
+        auto *toplevelSurface = qvariant_cast<WToplevelSurface*>(surfaceItem->property("surface"));
         if (!toplevelSurface)
             return false;
         Q_ASSERT(toplevelSurface->surface() == watched);
+        if (auto *xdgSurface = qvariant_cast<WXdgSurface*>(surfaceItem->property("surface"))) {
+            // TODO(waylib): popupSurface should not inherit WToplevelSurface
+            if (xdgSurface->isPopup()) {
+                return false;
+            }
+        }
         setActivateSurface(toplevelSurface);
     }