From 4b20ba24a383e3b42082dd8ff729e3d85fd55528 Mon Sep 17 00:00:00 2001
From: Fanpengcheng <fanpengcheng@uniontech.com>
Date: Fri, 6 Nov 2020 15:28:56 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E4=BB=BB=E5=8A=A1=E6=A0=8F?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=98=BE=E7=A4=BA=E5=A4=A7=E5=B0=8F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6(=E6=88=96=E9=AB=98=E5=BA=A6)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 81d9d8635c6032b94d4c7eec3d29edaf84857bd5.
---
 frame/item/pluginsitem.cpp          |  5 -----
 frame/item/pluginsitem.h            |  1 -
 frame/panel/mainpanelcontrol.cpp    | 18 ++++++------------
 interfaces/pluginsiteminterface.h   | 14 --------------
 plugins/datetime/datetimeplugin.cpp |  5 -----
 plugins/datetime/datetimeplugin.h   |  1 -
 6 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/frame/item/pluginsitem.cpp b/frame/item/pluginsitem.cpp
index dde3ce279..2a401274e 100644
--- a/frame/item/pluginsitem.cpp
+++ b/frame/item/pluginsitem.cpp
@@ -99,11 +99,6 @@ QString PluginsItem::pluginName() const
     return m_pluginInter->pluginName();
 }
 
-PluginsItemInterface::PluginSizePolicy PluginsItem::pluginSizePolicy() const
-{
-    return m_pluginInter->pluginSizePolicy();
-}
-
 DockItem::ItemType PluginsItem::itemType() const
 {
     if (m_pluginInter->type() == PluginsItemInterface::Normal) {
diff --git a/frame/item/pluginsitem.h b/frame/item/pluginsitem.h
index a4199f42a..e8ef4f262 100644
--- a/frame/item/pluginsitem.h
+++ b/frame/item/pluginsitem.h
@@ -41,7 +41,6 @@ public:
     void setInContainer(const bool container);
 
     QString pluginName() const;
-    PluginsItemInterface::PluginSizePolicy pluginSizePolicy() const;
 
     using DockItem::showContextMenu;
     using DockItem::hidePopup;
diff --git a/frame/panel/mainpanelcontrol.cpp b/frame/panel/mainpanelcontrol.cpp
index 2383d0af1..3c8021a75 100755
--- a/frame/panel/mainpanelcontrol.cpp
+++ b/frame/panel/mainpanelcontrol.cpp
@@ -1058,13 +1058,10 @@ void MainPanelControl::calcuDockIconSize(int w, int h, PluginsItem *trashPlugin,
             if (layout) {
                 PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget());
                 if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) {
-                    switch (pItem->pluginSizePolicy()) {
-                    case PluginsItemInterface::System:
-                        pItem->setFixedSize(tray_item_size, tray_item_size);
-                        break;
-                    case PluginsItemInterface::Custom:
+                    if (pItem->pluginName() == "datetime") {
                         pItem->setFixedSize(pItem->sizeHint().width(), h);
-                        break;
+                    } else {
+                        pItem->setFixedSize(tray_item_size, tray_item_size);
                     }
                 }
             }
@@ -1076,13 +1073,10 @@ void MainPanelControl::calcuDockIconSize(int w, int h, PluginsItem *trashPlugin,
             if (layout) {
                 PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget());
                 if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) {
-                    switch (pItem->pluginSizePolicy()) {
-                    case PluginsItemInterface::System:
-                        pItem->setFixedSize(tray_item_size, tray_item_size);
-                        break;
-                    case PluginsItemInterface::Custom:
+                    if (pItem->pluginName() == "datetime") {
                         pItem->setFixedSize(w, pItem->sizeHint().height());
-                        break;
+                    } else {
+                        pItem->setFixedSize(tray_item_size, tray_item_size);
                     }
                 }
             }
diff --git a/interfaces/pluginsiteminterface.h b/interfaces/pluginsiteminterface.h
index 30de23e66..80ee6528f 100644
--- a/interfaces/pluginsiteminterface.h
+++ b/interfaces/pluginsiteminterface.h
@@ -40,14 +40,6 @@ public:
         Fixed
     };
 
-    /**
-    * @brief Plugin size policy
-    */
-    enum PluginSizePolicy {
-        System = 1 << 0, // Follow the system
-        Custom = 1 << 1  // The custom
-    };
-
     ///
     /// \brief ~PluginsItemInterface
     /// DON'T try to delete m_proxyInter.
@@ -237,12 +229,6 @@ public:
     ///
     virtual PluginType type() { return Normal; }
 
-    ///
-    /// \brief plugin size policy
-    /// default plugin size policy
-    ///
-    virtual PluginSizePolicy pluginSizePolicy() const { return System; }
-
 protected:
     ///
     /// \brief m_proxyInter
diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp
index 99ea2c979..ddef3e1d6 100644
--- a/plugins/datetime/datetimeplugin.cpp
+++ b/plugins/datetime/datetimeplugin.cpp
@@ -47,11 +47,6 @@ const QString DatetimePlugin::pluginName() const
     return "datetime";
 }
 
-PluginsItemInterface::PluginSizePolicy DatetimePlugin::pluginSizePolicy() const
-{
-    return PluginsItemInterface::Custom;
-}
-
 const QString DatetimePlugin::pluginDisplayName() const
 {
     return tr("Datetime");
diff --git a/plugins/datetime/datetimeplugin.h b/plugins/datetime/datetimeplugin.h
index ea4536324..0bafa90e0 100644
--- a/plugins/datetime/datetimeplugin.h
+++ b/plugins/datetime/datetimeplugin.h
@@ -43,7 +43,6 @@ public:
     explicit DatetimePlugin(QObject *parent = nullptr);
 
     const QString pluginName() const override;
-    PluginSizePolicy pluginSizePolicy() const override;
     const QString pluginDisplayName() const override;
     void init(PluginProxyInterface *proxyInter) override;