From 482d142d2041c0c244b110d2ce9a3d4003cbcdd1 Mon Sep 17 00:00:00 2001
From: Ye ShanShan <yeshanshan@uniontech.com>
Date: Wed, 17 Jul 2024 16:27:28 +0800
Subject: [PATCH] chore: remove warning

as title.
---
 panels/dock/DockCompositor.qml                              | 2 +-
 panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml | 4 +++-
 panels/dock/tray/package/tray.qml                           | 3 +++
 panels/dock/tray/quickpanel/QuickPanel.qml                  | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/panels/dock/DockCompositor.qml b/panels/dock/DockCompositor.qml
index 6db2becc7..f98c54604 100644
--- 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
index b09634103..5383434ff 100644
--- 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
index 966da68ea..5be689b93 100644
--- a/panels/dock/tray/package/tray.qml
+++ b/panels/dock/tray/package/tray.qml
@@ -163,6 +163,7 @@ 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)
@@ -170,6 +171,7 @@ AppletItem {
                 })
                 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)
@@ -177,6 +179,7 @@ AppletItem {
                 })
                 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
index 6fc000b2e..939cc8233 100644
--- 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)
             }
         }