refactor: construct FashionTrayItem using TrayPlugin

Change-Id: I6df84d6b5a81cb72e55de1c60aa57317cfa32e20
linuxdeepin · Nov 21, 2018 · 7207bbf · 7207bbf
1 parent 6e88353
commit 7207bbf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/plugins/tray/fashiontrayitem.cpp b/plugins/tray/fashiontrayitem.cpp
@@ -33,16 +33,17 @@
 int FashionTrayItem::TrayWidgetWidth = TrayWidgetWidthMin;
 int FashionTrayItem::TrayWidgetHeight = TrayWidgetHeightMin;
 
-FashionTrayItem::FashionTrayItem(Dock::Position pos, QWidget *parent)
+FashionTrayItem::FashionTrayItem(TrayPlugin *trayPlugin, QWidget *parent)
     : QWidget(parent),
       m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight)),
       m_trayBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight)),
       m_leftSpliter(new QLabel),
       m_rightSpliter(new QLabel),
-      m_controlWidget(new FashionTrayControlWidget(pos)),
-      m_currentAttentionTray(nullptr),
       m_attentionDelayTimer(new QTimer(this)),
-      m_dockPosistion(pos)
+      m_dockPosistion(trayPlugin->dockPosition()),
+      m_trayPlugin(trayPlugin),
+      m_controlWidget(new FashionTrayControlWidget(m_dockPosistion)),
+      m_currentAttentionTray(nullptr)
 {
     m_leftSpliter->setStyleSheet("background-color: rgba(255, 255, 255, 0.1);");
     m_rightSpliter->setStyleSheet("background-color: rgba(255, 255, 255, 0.1);");
@@ -74,7 +75,7 @@ FashionTrayItem::FashionTrayItem(Dock::Position pos, QWidget *parent)
     m_attentionDelayTimer->setInterval(3000);
     m_attentionDelayTimer->setSingleShot(true);
 
-    setDockPostion(pos);
+    setDockPostion(m_dockPosistion);
     onTrayListExpandChanged(m_controlWidget->expanded());
 
     connect(m_controlWidget, &FashionTrayControlWidget::expandChanged, this, &FashionTrayItem::onTrayListExpandChanged);

diff --git a/plugins/tray/fashiontrayitem.h b/plugins/tray/fashiontrayitem.h
@@ -23,6 +23,7 @@
 #define FASHIONTRAYITEM_H
 
 #include "constants.h"
+#include "trayplugin.h"
 #include "fashiontraywidgetwrapper.h"
 #include "fashiontraycontrolwidget.h"
 
@@ -38,7 +39,7 @@ class FashionTrayItem : public QWidget
     Q_OBJECT
 
 public:
-    explicit FashionTrayItem(Dock::Position pos, QWidget *parent = 0);
+    explicit FashionTrayItem(TrayPlugin *trayPlugin, QWidget *parent = 0);
 
     void setTrayWidgets(const QMap<QString, AbstractTrayWidget *> &itemTrayMap);
     void trayWidgetAdded(const QString &itemKey, AbstractTrayWidget *trayWidget);
@@ -75,17 +76,20 @@ private Q_SLOTS:
     void refreshTraysVisible();
 
 private:
-    QList<QPointer<FashionTrayWidgetWrapper>> m_wrapperList;
     QBoxLayout *m_mainBoxLayout;
     QBoxLayout *m_trayBoxLayout;
     QLabel *m_leftSpliter;
     QLabel *m_rightSpliter;
-    FashionTrayControlWidget *m_controlWidget;
-    FashionTrayWidgetWrapper *m_currentAttentionTray;
     QTimer *m_attentionDelayTimer;
 
     Dock::Position m_dockPosistion;
 
+    TrayPlugin *m_trayPlugin;
+    FashionTrayControlWidget *m_controlWidget;
+    FashionTrayWidgetWrapper *m_currentAttentionTray;
+
+    QList<QPointer<FashionTrayWidgetWrapper>> m_wrapperList;
+
     static int TrayWidgetWidth;
     static int TrayWidgetHeight;
 };

diff --git a/plugins/tray/trayplugin.cpp b/plugins/tray/trayplugin.cpp
@@ -40,7 +40,7 @@ TrayPlugin::TrayPlugin(QObject *parent)
       m_systemTraysController(new SystemTraysController(this)),
       m_tipsLabel(new TipsWidget)
 {
-    m_fashionItem = new FashionTrayItem(position());
+    m_fashionItem = new FashionTrayItem(this);
 
     m_tipsLabel->setObjectName("tray");
     m_tipsLabel->setText(tr("System Tray"));
@@ -175,6 +175,11 @@ void TrayPlugin::setItemIsInContainer(const QString &itemKey, const bool contain
     m_proxyInter->saveValue(this, widKey.isEmpty() ? itemKey : widKey, container);
 }
 
+Dock::Position TrayPlugin::dockPosition() const
+{
+    return position();
+}
+
 const QString TrayPlugin::getWindowClass(quint32 winId)
 {
     auto *connection = QX11Info::connection();

diff --git a/plugins/tray/trayplugin.h b/plugins/tray/trayplugin.h
@@ -60,6 +60,8 @@ class TrayPlugin : public QObject, PluginsItemInterface
     void setSortKey(const QString &itemKey, const int order) Q_DECL_OVERRIDE;
     void setItemIsInContainer(const QString &itemKey, const bool container) Q_DECL_OVERRIDE;
 
+    Dock::Position dockPosition() const;
+
 private:
     void loadIndicator();
     const QString getWindowClass(quint32 winId);