From 368201498a9b1f67159e7445d16f89ffdfb4b37b Mon Sep 17 00:00:00 2001
From: wangxuwen <wangxuwen_cm@deepin.com>
Date: Tue, 10 Sep 2019 11:14:36 +0800
Subject: [PATCH] fixed(dock): fixed bug 2187 for dock display error when
 change position

---
 frame/panel/mainpanel.cpp   |  6 +++---
 frame/util/docksettings.cpp | 12 ------------
 frame/util/docksettings.h   |  2 --
 frame/window/mainwindow.cpp |  2 +-
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/frame/panel/mainpanel.cpp b/frame/panel/mainpanel.cpp
index 686b4cbba..662bb8b98 100644
--- a/frame/panel/mainpanel.cpp
+++ b/frame/panel/mainpanel.cpp
@@ -411,7 +411,7 @@ void MainPanel::adjustItemSize()
     const auto &itemList = m_itemController->itemList();
 
     // FTray: FashionTray
-    const QSize &FSTrayTotalSize = DockSettings::Instance().fashionTraySize(); // the total size of FSTray
+   // const QSize &FSTrayTotalSize = DockSettings::Instance().fashionTraySize(); // the total size of FSTray
     TrayPluginItem *FSTrayItem = nullptr; // the FSTray item object
     QSize FSTraySuggestIconSize = itemSize; // the suggested size of FStray icons
 
@@ -445,13 +445,13 @@ void MainPanel::adjustItemSize()
                     if (m_position == Dock::Top || m_position == Dock::Bottom) {
 //                        item->setFixedWidth(FSTrayTotalSize.width());
 //                        item->setFixedHeight(itemSize.height());
-                        totalWidth += FSTrayTotalSize.width();
+                        //totalWidth += FSTrayTotalSize.width();
                         totalHeight += itemSize.height();
                     } else {
 //                        item->setFixedWidth(itemSize.width());
 //                        item->setFixedHeight(FSTrayTotalSize.height());
                         totalWidth += itemSize.width();
-                        totalHeight += FSTrayTotalSize.height();
+                       // totalHeight += FSTrayTotalSize.height();
                     }
                 } else {
                     item->setFixedSize(itemSize);
diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp
index e3a0e454f..d5d3e2550 100644
--- a/frame/util/docksettings.cpp
+++ b/frame/util/docksettings.cpp
@@ -44,7 +44,6 @@ DockSettings::DockSettings(QWidget *parent)
     : QObject(parent)
     , m_autoHide(true)
     , m_opacity(0.4)
-    , m_fashionTraySize(QSize(0, 0))
     , m_fashionModeAct(tr("Fashion Mode"), this)
     , m_efficientModeAct(tr("Efficient Mode"), this)
     , m_topPosAct(tr("Top"), this)
@@ -367,9 +366,6 @@ void DockSettings::hideStateChanged()
 
 void DockSettings::dockItemCountChanged()
 {
-    if (m_displayMode == Dock::Efficient)
-        return;
-
     emit windowGeometryChanged();
 }
 
@@ -479,14 +475,6 @@ void DockSettings::onOpacityChanged(const double value)
 
 void DockSettings::onFashionTraySizeChanged(const QSize &traySize)
 {
-    if (m_displayMode == Dock::Efficient)
-        return;
-
-    if (m_fashionTraySize == traySize)
-        return;
-
-    m_fashionTraySize = traySize;
-
     emit windowGeometryChanged();
 }
 
diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h
index 8868aa4e8..656366cbb 100644
--- a/frame/util/docksettings.h
+++ b/frame/util/docksettings.h
@@ -76,7 +76,6 @@ public:
     inline const QRect frontendWindowRect() const { return m_frontendRect; }
     inline const QSize windowSize() const { return m_mainWindowSize; }
     inline const quint8 Opacity() const { return m_opacity * 255; }
-    inline const QSize fashionTraySize() const { return m_fashionTraySize; }
     const int dockMargin() const;
 
     const QSize panelSize() const;
@@ -137,7 +136,6 @@ private:
     DisplayMode m_displayMode;
     QRect m_primaryRawRect;
     QRect m_frontendRect;
-    QSize m_fashionTraySize;
 
     WhiteMenu m_settingsMenu;
     WhiteMenu *m_hideSubMenu;
diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp
index 86516cf3f..5bda7739b 100644
--- a/frame/window/mainwindow.cpp
+++ b/frame/window/mainwindow.cpp
@@ -783,7 +783,7 @@ void MainWindow::resetPanelEnvironment(const bool visible, const bool resetPosit
     }
 
     m_mainPanel->move(finishPos);
-//    m_mainPanel->updateDockPosition(position);
+    m_mainPanel->setPositonValue(position);
 }
 
 void MainWindow::updatePanelVisible()