From bb00071d5b4d38766833d08b3a0df29d69fc164e Mon Sep 17 00:00:00 2001
From: shaojun <wangshaojun_cm@deepin.com>
Date: Thu, 12 Sep 2019 17:04:53 +0800
Subject: [PATCH] feat(datetime):when dock on left and right,time font size fit
 to dock

---
 plugins/datetime/datetimeplugin.cpp |  4 ----
 plugins/datetime/datetimewidget.cpp | 24 ++++++++++++++++++++----
 plugins/datetime/datetimewidget.h   |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/plugins/datetime/datetimeplugin.cpp b/plugins/datetime/datetimeplugin.cpp
index 9bb19d7ba..4153a0bf6 100644
--- a/plugins/datetime/datetimeplugin.cpp
+++ b/plugins/datetime/datetimeplugin.cpp
@@ -92,10 +92,6 @@ void DatetimePlugin::loadPlugin()
     m_centralWidget = new DatetimeWidget;
 
     connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); });
-
-    connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString);
-    connect(m_centralWidget, &DatetimeWidget::requestUpdateGeometry, [this] { m_proxyInter->itemUpdate(this, pluginName()); });
-
     connect(m_refershTimer, &QTimer::timeout, this, &DatetimePlugin::updateCurrentTimeString);
 
     m_proxyInter->itemAdded(this, pluginName());
diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp
index e755e32ee..006db889a 100644
--- a/plugins/datetime/datetimewidget.cpp
+++ b/plugins/datetime/datetimewidget.cpp
@@ -31,7 +31,7 @@
 
 #define PLUGIN_STATE_KEY    "enable"
 #define SHOW_DATE_MIN_HEIGHT 45
-#define TIME_FONT DFontSizeManager::instance()->t5()
+#define TIME_FONT DFontSizeManager::instance()->t4()
 #define DATE_FONT DFontSizeManager::instance()->t10()
 
 DWIDGET_USE_NAMESPACE
@@ -68,7 +68,9 @@ void DatetimeWidget::set24HourFormat(const bool value)
 QSize DatetimeWidget::curTimeSize() const
 {
     const Dock::Position position = qApp->property(PROP_POSITION).value<Dock::Position>();
-    QFontMetrics fm(TIME_FONT);
+
+    m_timeFont = TIME_FONT;
+    QFontMetrics fm(m_timeFont);
     QString format;
     if (m_24HourFormat)
         format = "hh:mm";
@@ -83,7 +85,21 @@ QSize DatetimeWidget::curTimeSize() const
     if (position == Dock::Bottom || position == Dock::Top) {
         return QSize(timeSize.width(), DOCK_MAX_SIZE);
     } else {
-        return QSize(DOCK_MAX_SIZE, timeSize.height() * 2);
+        // 宽度不够显示日期则隐藏日期，宽度不够显示时间，则缩小时间字体适应dock
+        if (width() < dateSize.width()) {
+            QString timeString = QDateTime::currentDateTime().toString(format);
+
+            while (QFontMetrics(m_timeFont).boundingRect(timeString).size().width() > width()) {
+                m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1);
+            }
+
+            int timeHeight = QFontMetrics(m_timeFont).boundingRect(timeString).size().height();
+
+            return QSize(DOCK_MAX_SIZE, std::max(timeHeight, PLUGIN_BACKGROUND_MIN_SIZE));
+
+        } else {
+            return QSize(DOCK_MAX_SIZE, timeSize.height() + dateSize.height());
+        }
     }
 }
 
@@ -115,11 +131,11 @@ void DatetimeWidget::paintEvent(QPaintEvent *e)
         format = "hh:mm AP";
 
     painter.setPen(Qt::white);
+    painter.setFont(m_timeFont);
 
     if (rect().height() > SHOW_DATE_MIN_HEIGHT) {
         QRect timeRect = rect();
         timeRect.setBottom(rect().center().y() + m_timeOffset);
-        painter.setFont(TIME_FONT);
         painter.drawText(timeRect, Qt::AlignBottom | Qt::AlignHCenter, current.toString(format));
 
         QRect dateRect = rect();
diff --git a/plugins/datetime/datetimewidget.h b/plugins/datetime/datetimewidget.h
index d95925268..26f73a17f 100644
--- a/plugins/datetime/datetimewidget.h
+++ b/plugins/datetime/datetimewidget.h
@@ -48,6 +48,7 @@ private:
 private:
     bool m_24HourFormat;
     int m_timeOffset;
+    mutable QFont m_timeFont;
 };
 
 #endif // DATETIMEWIDGET_H