chore: remove warning

as title.
linuxdeepin · Jul 17, 2024 · 482d142 · 482d142
1 parent c54759f
commit 482d142
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/panels/dock/DockCompositor.qml b/panels/dock/DockCompositor.qml
@@ -92,7 +92,7 @@ Item {
             }
 
             onPluginPopupCreated: (popup) => {
-                console.log("plugin popup created", popup.pluginId, popup.itemKey, popup.pluginType)
+                console.log("plugin popup created", popup.pluginId, popup.itemKey, popup.popupType)
                 dockCompositor.popupCreated(popup)
             }
         }

diff --git a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
@@ -77,6 +77,8 @@ Button {
         }
 
         Component.onCompleted: {
+            if (!pluginItem.plugin)
+                return
             pluginItem.plugin.updatePluginGeometry(Qt.rect(pluginItem.itemGlobalPoint.x, pluginItem.itemGlobalPoint.y, 0, 0))
             pluginItem.plugin.setGlobalPos(pluginItem.itemGlobalPos)
         }
@@ -122,7 +124,7 @@ Button {
         }
     }
 
-    D.ColorSelector.hovered: (pluginItem.plugin.isItemActive ?? false) || hoverHandler.hovered
+    D.ColorSelector.hovered: pluginItem.plugin && pluginItem.plugin.isItemActive || hoverHandler.hovered
     background: D.BoxPanel {
         property D.Palette backgroundPalette: DockPalette.backgroundPalette
 

diff --git a/panels/dock/tray/package/tray.qml b/panels/dock/tray/package/tray.qml
@@ -163,20 +163,23 @@ AppletItem {
                     return
                 }
 
+                console.log("tray's tooltip created", popupSurface.pluginId, popupSurface.itemKey)
                 toolTip.shellSurface = popupSurface
                 toolTip.DockPanelPositioner.bounding = Qt.binding(function () {
                     var point = Qt.point(toolTip.shellSurface.x, toolTip.shellSurface.y)
                     return Qt.rect(point.x, point.y, toolTip.width, toolTip.height)
                 })
                 toolTip.open()
             } else if (popupSurface.popupType === Dock.TrayPopupTypePanel) {
+                console.log("tray's popup created", popupSurface.pluginId, popupSurface.itemKey)
                 popup.shellSurface = popupSurface
                 popup.DockPanelPositioner.bounding = Qt.binding(function () {
                     var point = Qt.point(popup.shellSurface.x, popup.shellSurface.y)
                     return Qt.rect(point.x, point.y, popup.width, popup.height)
                 })
                 popup.open()
             } else if (popupSurface.popupType === Dock.TrayPopupTypeMenu) {
+                console.log("tray's menu created", popupSurface.pluginId, popupSurface.itemKey)
                 popupMenu.shellSurface = popupSurface
                 popupMenu.DockPositioner.bounding = Qt.binding(function () {
                     var point = Qt.point(popupMenu.shellSurface.x, popupMenu.shellSurface.y)

diff --git a/panels/dock/tray/quickpanel/QuickPanel.qml b/panels/dock/tray/quickpanel/QuickPanel.qml
@@ -78,8 +78,8 @@ Item {
         target: DockCompositor
         function onPopupCreated(popupSurface)
         {
-            console.log("popup created", popupSurface.popupType, popupSurface.pluginId)
             if (popupSurface.popupType === Dock.TrayPopupTypeEmbed) {
+                console.log("popup created", popupSurface.popupType, popupSurface.pluginId)
                 quickpanelModel.requestShowSubPlugin(popupSurface.pluginId, popupSurface)
             }
         }