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

fix: frame opacity dbus valid

Browse Source 
Change-Id: Ic6211fc25779671af2f058efb602d5697c71f83c
This commit is contained in:
haruyukilxz 2018-10-11 09:21:11 +08:00
parent 0310a31352
commit e342a18953
No known key found for this signature in database
GPG Key ID: 593AFD577C1B1A60
Notes: gerrit 2018-10-11 10:22:41 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: 流年匆忙 <lxz@ilxz.me>
Submitted-by: 流年匆忙 <lxz@ilxz.me>
Submitted-at: Thu, 11 Oct 2018 10:22:41 +0800
Reviewed-on: https://cr.deepin.io/38867
Project: dde/dde-dock
Branch: refs/heads/master
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frame/util/docksettings.cpp
View File

@ -40,8 +40,8 @@ extern const QPoint rawXPosition(const QPoint &scaledPos);
DockSettings::DockSettings(QWidget *parent)
: QObject(parent)
, m_opacity(0)
, m_autoHide(true)
, m_opacity(0.4)
, m_fashionModeAct(tr("Fashion Mode"), this)
, m_efficientModeAct(tr("Efficient Mode"), this)
, m_topPosAct(tr("Top"), this)
@ -128,6 +128,15 @@ DockSettings::DockSettings(QWidget *parent)
m_settingsMenu.addAction(hideSubMenuAct);
m_settingsMenu.setTitle("Settings Menu");
auto onDaemonIsvalid = [=] (bool isValid) {
if (isValid) {
onOpacityChanged(m_appearanceInter->opacity());
}
else {
m_appearanceInter->startServiceProcess();
}
};
connect(&m_settingsMenu, &WhiteMenu::triggered, this, &DockSettings::menuActionClicked);
connect(m_dockInter, &DBusDock::PositionChanged, this, &DockSettings::onPositionChanged);
connect(m_dockInter, &DBusDock::IconSizeChanged, this, &DockSettings::iconSizeChanged);
@ -143,6 +152,10 @@ DockSettings::DockSettings(QWidget *parent)
connect(m_displayInter, &DBusDisplay::ScreenHeightChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection);
connect(m_displayInter, &DBusDisplay::ScreenWidthChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection);
connect(m_appearanceInter, &Appearance::serviceStartFinished, this, [=] {
onDaemonIsvalid(m_appearanceInter->isValid());
});
connect(m_appearanceInter, &Appearance::serviceValidChanged, this, onDaemonIsvalid);
connect(m_appearanceInter, &Appearance::OpacityChanged, this, &DockSettings::onOpacityChanged);
DApplication *app = qobject_cast<DApplication*>(qApp);
@ -153,7 +166,8 @@ DockSettings::DockSettings(QWidget *parent)
calculateWindowConfig();
updateForbidPostions();
resetFrontendGeometry();
onOpacityChanged(m_appearanceInter->opacity());
onDaemonIsvalid(m_appearanceInter->isValid());
}
DockSettings &DockSettings::Instance()