fix: dock or undock abnormal function

as title Log: as title Influence: dock or undock function
linuxdeepin · Jul 11, 2024 · a66879b · a66879b
1 parent 5d3f843
commit a66879b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/panels/dock/tray/trayitem.cpp b/panels/dock/tray/trayitem.cpp
@@ -68,18 +68,12 @@ DockItemInfos TrayItem::dockItemInfos()
     return m_itemInfos;
 }
 
-void TrayItem::setItemOnDock(const QString &settingKey, const QString &itemKey, bool visible)
+void TrayItem::setItemOnDock(const QString &settingKey, const QString &surfaceId, bool visible)
 {
     Q_UNUSED(settingKey)
-    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);
+
+    visible ? TraySettings::instance()->addTrayItemOnDock(surfaceId) :
+              TraySettings::instance()->removeTrayItemOnDock(surfaceId);
 }
 
 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 &itemKey, bool visible);
+    Q_INVOKABLE void setItemOnDock(const QString &settingKey, const QString &surfaceId, bool visible);
 
 Q_SIGNALS:
     void trayPluginModelChanged();