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

save auto expand delay settings to backend

Browse Source 
Change-Id: Ie86fddb259ba49678026112f6482bd4424bfeeaa
This commit is contained in:
石博文 2016-09-06 11:31:03 +08:00
parent fe212ce82a
commit adcc57e7cb
Notes: Deepin Code Review 2016-09-06 06:38:04 +00:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: Hualet Wang <mr.asianwang@gmail.com>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Tue, 06 Sep 2016 06:38:04 +0000
Reviewed-on: https://cr.deepin.io/15876
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/dbus/dbusdock.h
View File

@ -91,6 +91,10 @@ public:
inline void setIconSize(quint32 value)
{ setProperty("IconSize", QVariant::fromValue(value)); }
Q_PROPERTY(quint32 ShowTimeout READ showTimeout NOTIFY ShowTimeoutChanged)
inline quint32 showTimeout() const
{ return qvariant_cast< quint32 >(property("ShowTimeout")); }
public Q_SLOTS: // METHODS
inline QDBusPendingReply<> ActivateWindow(uint in0)
{
@ -171,6 +175,7 @@ void HideModeChanged();
void HideStateChanged();
void PositionChanged();
void IconSizeChanged();
void ShowTimeoutChanged();
};
namespace com {

10
frame/util/docksettings.cpp
View File

@ -140,6 +140,16 @@ int DockSettings::screenWidth() const
return m_displayInter->screenWidth();
}
int DockSettings::expandTimeout() const
{
return m_dockInter->showTimeout();
}
int DockSettings::narrowTimeout() const
{
return 0;
}
bool DockSettings::autoHide() const
{
return m_autoHide;

3
frame/util/docksettings.h
View File

@ -41,6 +41,9 @@ public:
Position position() const;
int screenHeight() const;
int screenWidth() const;
int expandTimeout() const;
int narrowTimeout() const;
bool autoHide() const;
const QRect primaryRect() const;
const QSize windowSize() const;

2
frame/window/mainwindow.cpp
View File

@ -117,7 +117,7 @@ void MainWindow::initComponents()
m_positionUpdateTimer->start();
m_expandDelayTimer->setSingleShot(true);
m_expandDelayTimer->setInterval(100);
m_expandDelayTimer->setInterval(m_settings->expandTimeout());
m_sizeChangeAni->setDuration(200);
m_sizeChangeAni->setEasingCurve(QEasingCurve::InOutCubic);