From a4a9430f3a7169660b33d03279896d3b59db1485 Mon Sep 17 00:00:00 2001
From: shaojun <wangshaojun_cm@deepin.com>
Date: Tue, 12 Nov 2019 18:55:27 +0800
Subject: [PATCH] fixed:remove custom menu

---
 frame/util/docksettings.cpp | 10 +++++-----
 frame/util/docksettings.h   | 17 ++---------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp
index 283493892..44d001ae4 100644
--- a/frame/util/docksettings.cpp
+++ b/frame/util/docksettings.cpp
@@ -79,13 +79,13 @@ DockSettings::DockSettings(QWidget *parent)
     m_keepHiddenAct.setCheckable(true);
     m_smartHideAct.setCheckable(true);
 
-    WhiteMenu *modeSubMenu = new WhiteMenu(&m_settingsMenu);
+    QMenu *modeSubMenu = new QMenu(&m_settingsMenu);
     modeSubMenu->addAction(&m_fashionModeAct);
     modeSubMenu->addAction(&m_efficientModeAct);
     QAction *modeSubMenuAct = new QAction(tr("Mode"), this);
     modeSubMenuAct->setMenu(modeSubMenu);
 
-    WhiteMenu *locationSubMenu = new WhiteMenu(&m_settingsMenu);
+    QMenu *locationSubMenu = new QMenu(&m_settingsMenu);
     locationSubMenu->addAction(&m_topPosAct);
     locationSubMenu->addAction(&m_bottomPosAct);
     locationSubMenu->addAction(&m_leftPosAct);
@@ -93,14 +93,14 @@ DockSettings::DockSettings(QWidget *parent)
     QAction *locationSubMenuAct = new QAction(tr("Location"), this);
     locationSubMenuAct->setMenu(locationSubMenu);
 
-    WhiteMenu *statusSubMenu = new WhiteMenu(&m_settingsMenu);
+    QMenu *statusSubMenu = new QMenu(&m_settingsMenu);
     statusSubMenu->addAction(&m_keepShownAct);
     statusSubMenu->addAction(&m_keepHiddenAct);
     statusSubMenu->addAction(&m_smartHideAct);
     QAction *statusSubMenuAct = new QAction(tr("Status"), this);
     statusSubMenuAct->setMenu(statusSubMenu);
 
-    m_hideSubMenu = new WhiteMenu(&m_settingsMenu);
+    m_hideSubMenu = new QMenu(&m_settingsMenu);
     QAction *hideSubMenuAct = new QAction(tr("Plugins"), this);
     hideSubMenuAct->setMenu(m_hideSubMenu);
 
@@ -110,7 +110,7 @@ DockSettings::DockSettings(QWidget *parent)
     m_settingsMenu.addAction(hideSubMenuAct);
     m_settingsMenu.setTitle("Settings Menu");
 
-    connect(&m_settingsMenu, &WhiteMenu::triggered, this, &DockSettings::menuActionClicked);
+    connect(&m_settingsMenu, &QMenu::triggered, this, &DockSettings::menuActionClicked);
     connect(m_dockInter, &DBusDock::PositionChanged, this, &DockSettings::onPositionChanged);
     connect(m_dockInter, &DBusDock::DisplayModeChanged, this, &DockSettings::onDisplayModeChanged);
     connect(m_dockInter, &DBusDock::HideModeChanged, this, &DockSettings::hideModeChanged, Qt::QueuedConnection);
diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h
index e958b5805..3bcafceea 100644
--- a/frame/util/docksettings.h
+++ b/frame/util/docksettings.h
@@ -42,19 +42,6 @@ DWIDGET_USE_NAMESPACE
 using namespace Dock;
 using DBusDock = com::deepin::dde::daemon::Dock;
 
-class WhiteMenu : public QMenu
-{
-    Q_OBJECT
-public:
-    WhiteMenu(QWidget *parent = nullptr) : QMenu(parent)
-    {
-        QStyle *style = QStyleFactory::create("dlight");
-        if (style) setStyle(style);
-    }
-
-    virtual ~WhiteMenu() {}
-};
-
 class DockSettings : public QObject
 {
     Q_OBJECT
@@ -140,8 +127,8 @@ private:
     QRect m_primaryRawRect;
     QRect m_frontendRect;
 
-    WhiteMenu m_settingsMenu;
-    WhiteMenu *m_hideSubMenu;
+    QMenu m_settingsMenu;
+    QMenu *m_hideSubMenu;
     QAction m_fashionModeAct;
     QAction m_efficientModeAct;
     QAction m_topPosAct;