Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed:remove custom menu

Browse Source
This commit is contained in:
shaojun 2019-11-12 18:55:27 +08:00
parent 617c53b318
commit a4a9430f3a
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frame/util/docksettings.cpp
View File

@ -79,13 +79,13 @@ DockSettings::DockSettings(QWidget *parent)
m_keepHiddenAct.setCheckable(true); m_keepHiddenAct.setCheckable(true);
m_smartHideAct.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_fashionModeAct);
modeSubMenu->addAction(&m_efficientModeAct); modeSubMenu->addAction(&m_efficientModeAct);
QAction *modeSubMenuAct = new QAction(tr("Mode"), this); QAction *modeSubMenuAct = new QAction(tr("Mode"), this);
modeSubMenuAct->setMenu(modeSubMenu); modeSubMenuAct->setMenu(modeSubMenu);
WhiteMenu *locationSubMenu = new WhiteMenu(&m_settingsMenu); QMenu *locationSubMenu = new QMenu(&m_settingsMenu);
locationSubMenu->addAction(&m_topPosAct); locationSubMenu->addAction(&m_topPosAct);
locationSubMenu->addAction(&m_bottomPosAct); locationSubMenu->addAction(&m_bottomPosAct);
locationSubMenu->addAction(&m_leftPosAct); locationSubMenu->addAction(&m_leftPosAct);
@ -93,14 +93,14 @@ DockSettings::DockSettings(QWidget *parent)
QAction *locationSubMenuAct = new QAction(tr("Location"), this); QAction *locationSubMenuAct = new QAction(tr("Location"), this);
locationSubMenuAct->setMenu(locationSubMenu); locationSubMenuAct->setMenu(locationSubMenu);
WhiteMenu *statusSubMenu = new WhiteMenu(&m_settingsMenu); QMenu *statusSubMenu = new QMenu(&m_settingsMenu);
statusSubMenu->addAction(&m_keepShownAct); statusSubMenu->addAction(&m_keepShownAct);
statusSubMenu->addAction(&m_keepHiddenAct); statusSubMenu->addAction(&m_keepHiddenAct);
statusSubMenu->addAction(&m_smartHideAct); statusSubMenu->addAction(&m_smartHideAct);
QAction *statusSubMenuAct = new QAction(tr("Status"), this); QAction *statusSubMenuAct = new QAction(tr("Status"), this);
statusSubMenuAct->setMenu(statusSubMenu); statusSubMenuAct->setMenu(statusSubMenu);
m_hideSubMenu = new WhiteMenu(&m_settingsMenu); m_hideSubMenu = new QMenu(&m_settingsMenu);
QAction *hideSubMenuAct = new QAction(tr("Plugins"), this); QAction *hideSubMenuAct = new QAction(tr("Plugins"), this);
hideSubMenuAct->setMenu(m_hideSubMenu); hideSubMenuAct->setMenu(m_hideSubMenu);
@ -110,7 +110,7 @@ DockSettings::DockSettings(QWidget *parent)
m_settingsMenu.addAction(hideSubMenuAct); m_settingsMenu.addAction(hideSubMenuAct);
m_settingsMenu.setTitle("Settings Menu"); 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::PositionChanged, this, &DockSettings::onPositionChanged);
connect(m_dockInter, &DBusDock::DisplayModeChanged, this, &DockSettings::onDisplayModeChanged); connect(m_dockInter, &DBusDock::DisplayModeChanged, this, &DockSettings::onDisplayModeChanged);
connect(m_dockInter, &DBusDock::HideModeChanged, this, &DockSettings::hideModeChanged, Qt::QueuedConnection); connect(m_dockInter, &DBusDock::HideModeChanged, this, &DockSettings::hideModeChanged, Qt::QueuedConnection);

17
frame/util/docksettings.h
View File

@ -42,19 +42,6 @@ DWIDGET_USE_NAMESPACE
using namespace Dock; using namespace Dock;
using DBusDock = com::deepin::dde::daemon::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 class DockSettings : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -140,8 +127,8 @@ private:
QRect m_primaryRawRect; QRect m_primaryRawRect;
QRect m_frontendRect; QRect m_frontendRect;
WhiteMenu m_settingsMenu; QMenu m_settingsMenu;
WhiteMenu *m_hideSubMenu; QMenu *m_hideSubMenu;
QAction m_fashionModeAct; QAction m_fashionModeAct;
QAction m_efficientModeAct; QAction m_efficientModeAct;
QAction m_topPosAct; QAction m_topPosAct;