From cc88ed7135df1a08dd8ae76bde21a551a9f9a1d1 Mon Sep 17 00:00:00 2001 From: songwentao Date: Wed, 8 Sep 2021 12:34:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit curTimeSize()接口计算的时间控件大小和实际绘制出来的大小不一致,当字体大小调整后重新计算任务栏下各控件的实际大小,可解决当前显示不全问题. Log: 修复时间插件显示不全问题 Bug: https://pms.uniontech.com/zentao/bug-view-90894.html Change-Id: I2fb9062e985403105f3835646b884838384b970b --- plugins/datetime/datetimewidget.cpp | 8 ++++++++ plugins/datetime/datetimewidget.h | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/datetime/datetimewidget.cpp b/plugins/datetime/datetimewidget.cpp index df0237db5..08bfbb39e 100644 --- a/plugins/datetime/datetimewidget.cpp +++ b/plugins/datetime/datetimewidget.cpp @@ -176,6 +176,14 @@ QSize DatetimeWidget::sizeHint() const return curTimeSize(); } +void DatetimeWidget::resizeEvent(QResizeEvent *event) +{ + if (isVisible()) + emit requestUpdateGeometry(); + + QWidget::resizeEvent(event); +} + /** * @brief DatetimeWidget::paintEvent 绘制任务栏时间日期 * @param e diff --git a/plugins/datetime/datetimewidget.h b/plugins/datetime/datetimewidget.h index 8903ed9f1..42cba4942 100644 --- a/plugins/datetime/datetimewidget.h +++ b/plugins/datetime/datetimewidget.h @@ -38,6 +38,10 @@ public: bool is24HourFormat() const { return m_24HourFormat; } QSize sizeHint() const; +protected: + void resizeEvent(QResizeEvent *event); + void paintEvent(QPaintEvent *e); + signals: void requestUpdateGeometry() const; @@ -49,7 +53,6 @@ private Q_SLOTS: void setShortTimeFormat(int type); private: - void paintEvent(QPaintEvent *e); QSize curTimeSize() const; private: @@ -60,7 +63,6 @@ private: Timedate *m_timedateInter; QString m_shortDateFormat; QString m_shortTimeFormat; - }; #endif // DATETIMEWIDGET_H