From 2994f0402294f6f791af6a43f9516234a55a719d Mon Sep 17 00:00:00 2001 From: shaojun Date: Tue, 19 Nov 2019 11:26:11 +0800 Subject: [PATCH] feat(plugin):show date min height --- frame/util/docksettings.cpp | 2 +- plugins/datetime/datetimewidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index fb508b0d2..f45e20b0c 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -43,6 +43,7 @@ extern const QPoint rawXPosition(const QPoint &scaledPos); DockSettings::DockSettings(QWidget *parent) : QObject(parent) + , m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_autoHide(true) , m_opacity(0.4) , m_fashionModeAct(tr("Fashion Mode"), this) @@ -55,7 +56,6 @@ DockSettings::DockSettings(QWidget *parent) , m_keepHiddenAct(tr("Keep Hidden"), this) , m_smartHideAct(tr("Smart Hide"), this) , m_displayInter(new DBusDisplay(this)) - , m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) , m_itemManager(DockItemManager::instance(this)) { m_primaryRawRect = m_displayInter->primaryRawRect(); diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index 33780e741..df1cdc55b 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -31,7 +31,7 @@ #include #define PLUGIN_STATE_KEY "enable" -#define SHOW_DATE_MIN_HEIGHT 45 +#define SHOW_DATE_MIN_HEIGHT 40 #define TIME_FONT DFontSizeManager::instance()->t4() #define DATE_FONT DFontSizeManager::instance()->t10()