From 2797bab749b72a25a14487ade1037237c2f386f8 Mon Sep 17 00:00:00 2001 From: wangxuwen Date: Wed, 4 Sep 2019 18:13:25 +0800 Subject: [PATCH] feat(dock): correct the date dispaly --- plugins/datetime/datetimewidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index 8d8510c1e..e6443faaa 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -68,9 +68,9 @@ QSize DatetimeWidget::sizeHint() const QFontMetrics fm(qApp->font()); if (m_24HourFormat) - return fm.boundingRect("8888/88/88").size() + QSize(20, 10); + return fm.boundingRect("8888/88/88").size() + QSize(30, 10); else - return fm.boundingRect("88:88 A.A.").size() + QSize(20, 20); + return fm.boundingRect("88:88 A.A.").size() + QSize(30, 20); } void DatetimeWidget::resizeEvent(QResizeEvent *e) @@ -98,7 +98,7 @@ void DatetimeWidget::paintEvent(QPaintEvent *e) painter.setPen(Qt::white); - if (displayMode == Dock::Fashion && rect().height() > SHOW_DATE_MIN_HEIGHT) { + if (rect().height() > SHOW_DATE_MIN_HEIGHT) { QRect timeRect = rect(); timeRect.setBottom(rect().center().y() + m_timeOffset); painter.setFont(TIME_FONT);