From a9f403fbee7c5606143e90e299e775519b8b1dc3 Mon Sep 17 00:00:00 2001 From: Zhang Qipeng Date: Thu, 17 Dec 2020 15:21:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=97=B4=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=A7=E5=B0=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在切换任务栏位置时时间插件返回的大小有问题。 Log: 修复时间插件显示不完整的问题。 Change-Id: I84c3004728f725fc81e6c46ee1f6817c778fa589 --- plugins/datetime/datetimewidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index a3151664e..d194b57a7 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -135,7 +135,7 @@ QSize DatetimeWidget::curTimeSize() const dateSize.setWidth(QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width()); } } - return QSize(std::max(timeSize.width(), dateSize.width()) + 2, height()); + return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height()); } else { while (std::max(QFontMetrics(m_timeFont).boundingRect(timeString).size().width(), QFontMetrics(m_dateFont).boundingRect("0000/00/00").size().width()) > (width() - 4)) { m_timeFont.setPixelSize(m_timeFont.pixelSize() - 1); @@ -150,7 +150,7 @@ QSize DatetimeWidget::curTimeSize() const } } m_timeOffset = (timeSize.height() - dateSize.height()) / 2 ; - return QSize(width(), timeSize.height() + dateSize.height()); + return QSize(std::max(timeSize.width(), dateSize.width()), timeSize.height() + dateSize.height()); } }