feat: Receive close quick panel requests from plugins

Bug: https://pms.uniontech.com/bug-view-272277.html Log: Receive close quick panel requests from plugins
linuxdeepin · Feb 24, 2025 · f831c59 · f831c59
1 parent 975be34
commit f831c59
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/panels/dock/DockCompositor.qml b/panels/dock/DockCompositor.qml
@@ -29,6 +29,7 @@ Item {
     signal pluginSurfacesUpdated()
     signal popupCreated(var popup)
     signal requestShutdown(var type)
+    signal popupClosed()
 
     function removeDockPluginSurface(model, object) {
         for (var i = 0; i < model.count; ++i) {
@@ -107,6 +108,11 @@ Item {
             onRequestShutdown: (type) => {
                 dockCompositor.requestShutdown(type)
             }
+
+            onPluginCloseQuickPanelPopup: {
+                console.log("quick panel closed")
+                dockCompositor.popupClosed()
+            }
         }
 
         PluginScaleManager{

diff --git a/panels/dock/pluginmanagerextension.cpp b/panels/dock/pluginmanagerextension.cpp
@@ -207,6 +207,11 @@ void PluginSurface::plugin_request_shutdown(Resource *resource, const QString &t
     Q_EMIT m_manager->requestShutdown(type);
 }
 
+void PluginSurface::plugin_close_quick_panel(Resource *resource) {
+    qInfo() << "close_quick_panel";
+    Q_EMIT m_manager->pluginCloseQuickPanelPopup();
+}
+
 void PluginSurface::plugin_destroy_resource(Resource *resource)
 {
     Q_UNUSED(resource);

diff --git a/panels/dock/pluginmanagerextension_p.h b/panels/dock/pluginmanagerextension_p.h
@@ -78,6 +78,7 @@ class PluginManager : public QWaylandCompositorExtensionTemplate<PluginManager>,
 
 Q_SIGNALS:
     void pluginPopupCreated(PluginPopup*);
+    void pluginCloseQuickPanelPopup();
     void pluginSurfaceCreated(PluginSurface*);
     void pluginSurfaceDestroyed(PluginSurface*);
     void messageRequest(PluginSurface *, const QString &msg);
@@ -177,6 +178,7 @@ class PluginSurface : public QWaylandShellSurfaceTemplate<PluginSurface>, public
     virtual void plugin_mouse_event(Resource *resource, int32_t type) override;
     virtual void plugin_dcc_icon(Resource *resource, const QString &icon) override;
     virtual void plugin_request_shutdown(Resource *resource, const QString &type) override;
+    virtual void plugin_close_quick_panel(Resource *resource) override;
     virtual void plugin_destroy_resource(Resource *resource) override;
     virtual void plugin_destroy(Resource *resource) override;
     virtual void plugin_source_size(Resource *resource, int32_t width, int32_t height) override;

diff --git a/panels/dock/tray/quickpanel/QuickPanel.qml b/panels/dock/tray/quickpanel/QuickPanel.qml
@@ -132,5 +132,9 @@ Item {
                 quickpanelModel.requestShowSubPlugin(popupSurface.pluginId, popupSurface)
             }
         }
+
+        function onPopupClosed() {
+            popup.close()
+        }
     }
 }