Revert "fix: dock or undock abnormal function (#546)"

This reverts commit 57544a2. Issue: linuxdeepin/developer-center#9714 Issue: linuxdeepin/developer-center#9718
linuxdeepin · Jul 17, 2024 · bec98b6 · bec98b6
1 parent 6bc10f1
commit bec98b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/panels/dock/tray/trayitem.cpp b/panels/dock/tray/trayitem.cpp
@@ -68,12 +68,18 @@ DockItemInfos TrayItem::dockItemInfos()
     return m_itemInfos;
 }
 
-void TrayItem::setItemOnDock(const QString &settingKey, const QString &surfaceId, bool visible)
+void TrayItem::setItemOnDock(const QString &settingKey, const QString &itemKey, bool visible)
 {
     Q_UNUSED(settingKey)
-
-    visible ? TraySettings::instance()->addTrayItemOnDock(surfaceId) :
-              TraySettings::instance()->removeTrayItemOnDock(surfaceId);
+    QString pluginId;
+    for (const DockItemInfo &itemInfo : m_itemInfos) {
+        if (itemInfo.itemKey == itemKey) {
+            pluginId = itemInfo.name;
+            break;
+        }
+    }
+    visible ? TraySettings::instance()->addTrayItemOnDock(pluginId + "::" + itemKey) :
+              TraySettings::instance()->removeTrayItemOnDock(pluginId + "::" + itemKey);
 }
 
 D_APPLET_CLASS(TrayItem)

diff --git a/panels/dock/tray/trayitem.h b/panels/dock/tray/trayitem.h
@@ -23,7 +23,7 @@ class TrayItem : public DS_NAMESPACE::DApplet
     void setTrayPluginModel(QAbstractItemModel *newTrayPluginModel);
 
     Q_INVOKABLE DockItemInfos dockItemInfos();
-    Q_INVOKABLE void setItemOnDock(const QString &settingKey, const QString &surfaceId, bool visible);
+    Q_INVOKABLE void setItemOnDock(const QString &settingKey, const QString &itemKey, bool visible);
 
 Q_SIGNALS:
     void trayPluginModelChanged();