feat(dock): delete invalid code for set icon size logic

frame/item/appitem.cpp

@@ -43,7 +43,6 @@
 
 #define APP_DRAG_THRESHOLD      20
 
-int AppItem::IconBaseSize;
 QPoint AppItem::MousePressPos;
 
 static QGSettings *GSettingsByApp()
@@ -162,24 +161,6 @@ void AppItem::updateWindowIconGeometries()
         xcb_misc->set_window_icon_geometry(it.key(), r);
 }
 
-void AppItem::setIconBaseSize(const int size)
-{
-    IconBaseSize = size;
-}
-
-int AppItem::iconBaseSize()
-{
-    return IconBaseSize;
-}
-
-int AppItem::itemBaseWidth()
-{
-    if (DockDisplayMode == Dock::Fashion)
-        return itemBaseHeight() * 1.1;
-    else
-        return itemBaseHeight() * 1.4;
-}
-
 void AppItem::undock()
 {
     m_itemEntryInter->RequestUndock();
@@ -212,14 +193,6 @@ void AppItem::moveEvent(QMoveEvent *e)
     m_updateIconGeometryTimer->start();
 }
 
-int AppItem::itemBaseHeight()
-{
-    if (DockDisplayMode == Efficient)
-        return IconBaseSize * 1.2;
-    else
-        return IconBaseSize * 1.5;
-}
-
 void AppItem::paintEvent(QPaintEvent *e)
 {
     DockItem::paintEvent(e);

frame/item/appitem.h

@@ -48,10 +48,6 @@ public:
     const QString appId() const;
     const bool isValid() const;
     void updateWindowIconGeometries();
-    static void setIconBaseSize(const int size);
-    static int iconBaseSize();
-    static int itemBaseHeight();
-    static int itemBaseWidth();
     void undock();
     QWidget *appDragWidget();
     void setDockInfo(Dock::Position dockPosition, const QRect &dockGeometry);
@@ -129,7 +125,6 @@ private:
     QFutureWatcher<QPixmap> *m_smallWatcher;
     QFutureWatcher<QPixmap> *m_largeWatcher;
 
-    static int IconBaseSize;
     static QPoint MousePressPos;
 };
 

frame/panel/mainpanel.cpp

@@ -389,12 +389,12 @@ void MainPanel::adjustItemSize()
     case Top:
     case Bottom:
         itemSize.setHeight(m_destSize.height() - PANEL_BORDER);
-        itemSize.setWidth(std::round(qreal(AppItem::itemBaseWidth()) / ratio));
+        //itemSize.setWidth(std::round(qreal(AppItem::itemBaseWidth()) / ratio));
         break;
 
     case Left:
     case Right:
-        itemSize.setHeight(std::round(qreal(AppItem::itemBaseHeight()) / ratio));
+        //itemSize.setHeight(std::round(qreal(AppItem::itemBaseHeight()) / ratio));
         itemSize.setWidth(m_destSize.width() - PANEL_BORDER);
         break;
 
@@ -587,9 +587,9 @@ void MainPanel::adjustItemSize()
     }
 
     // 如果dock的大小已经是最大的则不再调整时尚模式托盘图标的大小,以避免递归调整dock与托盘的大小
-    if (!DockSettings::Instance().isMaxSize() && FSTrayItem) {
-        FSTrayItem->setSuggestIconSize(FSTraySuggestIconSize);
-    }
+//    if (!DockSettings::Instance().isMaxSize() && FSTrayItem) {
+//        FSTrayItem->setSuggestIconSize(FSTraySuggestIconSize);
+//    }
 
     // ensure all extra space assigned
     Q_ASSERT(extraDecrease == 0);

frame/util/docksettings.cpp

@@ -43,7 +43,6 @@ extern const QPoint rawXPosition(const QPoint &scaledPos);
 DockSettings::DockSettings(QWidget *parent)
     : QObject(parent)
     , m_autoHide(true)
-    , m_isMaxSize(false)
     , m_opacity(0.4)
     , m_fashionTraySize(QSize(0, 0))
     , m_fashionModeAct(tr("Fashion Mode"), this)
@@ -542,22 +541,17 @@ void DockSettings::calculateWindowConfig()
         case Bottom: {
             m_mainWindowSize.setHeight(m_dockWindowSize);
             m_mainWindowSize.setWidth(this->primaryRect().width() - MAINWINDOW_MARGIN * 2);
-            // m_isMaxSize = (calcWidth == maxWidth);
             break;
         }
         case Left:
         case Right: {
             m_mainWindowSize.setHeight(this->primaryRect().height() - MAINWINDOW_MARGIN * 2);
             m_mainWindowSize.setWidth(m_dockWindowSize);
-            //m_isMaxSize = (calcHeight == maxHeight);
             break;
         }
         default:
             Q_ASSERT(false);
         }
-
-        // used by FashionTrayItem of TrayPlugin
-        qApp->setProperty("DockIsMaxiedSize", m_isMaxSize);
     } else {
         Q_ASSERT(false);
     }

frame/util/docksettings.h

@@ -71,7 +71,6 @@ public:
     inline int expandTimeout() const { return m_dockInter->showTimeout(); }
     inline int narrowTimeout() const { return 100; }
     inline bool autoHide() const { return m_autoHide; }
-    inline bool isMaxSize() const { return m_isMaxSize; }
     const QRect primaryRect() const;
     inline const QRect primaryRawRect() const { return m_primaryRawRect; }
     inline const QRect frontendWindowRect() const { return m_frontendRect; }
@@ -127,7 +126,6 @@ private:
 private:
     int m_dockWindowSize;
     bool m_autoHide;
-    bool m_isMaxSize;
     int m_screenRawHeight;
     int m_screenRawWidth;
     double m_opacity;