fix: tooltip size might not updated when font size changed

目前TipsWidget控件的尺寸会在字体变化时通过调用setText()更新,但当文字
内容无变化时会跳过后续逻辑,导致尺寸未变化.

此提交通过重新实现 (minimum)sizeHint() 来提供控件期望的尺寸大小,并
确保尺寸能够及时更新.

PMS: BUG-332523
Log:

Author: BLumia

plugins/dde-dock/power/powerplugin.cpp

@@ -349,10 +349,7 @@ void PowerPlugin::refreshTipsData()
         }
     }
 
-    m_tipsLabel->setText(tips); 
-    QFontMetrics metrics(m_tipsLabel->font());
-    int textWidth = metrics.boundingRect(m_tipsLabel->text()).width();
-    m_tipsLabel->setMinimumWidth(textWidth);
+    m_tipsLabel->setText(tips);
     m_powerStatusWidget->refreshBatteryPercentage(value, appletTips);
 }
 

plugins/dde-dock/widgets/tipswidget.cpp

@@ -37,11 +37,7 @@ void TipsWidget::setText(const QString &text)
     m_text = "བོད་སྐད་ཡིག་གཟུགས་ཚད་ལེན་ཚོད་ལྟའི་སྐོར་གྱི་རྗོད་ཚིག";
 #endif
 
-    setFixedSize(fontMetrics().horizontalAdvance(m_text), fontMetrics().boundingRect(m_text).height());
-    if (parentWidget()) {
-        parentWidget()->adjustSize();
-    }
-
+    updateGeometry();
     update();
 
 #ifndef QT_NO_ACCESSIBILITY
@@ -60,18 +56,7 @@ void TipsWidget::setTextList(const QStringList &textList)
     }
     m_textList = textList;
 
-    int width = 0;
-    int height = 0;
-    for (const QString& text : m_textList) {
-        width = qMax(width, fontMetrics().horizontalAdvance(text));
-        height += fontMetrics().boundingRect(text).height();
-    }
-
-    setFixedSize(width, height);
-    if (parentWidget()) {
-        parentWidget()->adjustSize();
-    }
-
+    updateGeometry();
     update();
 }
 
@@ -110,25 +95,45 @@ void TipsWidget::paintEvent(QPaintEvent *event)
     }
 }
 
+QSize TipsWidget::sizeHint() const
+{
+    const QFontMetrics fm = fontMetrics();
+
+    switch (m_type) {
+    case SingleLine: {
+        return QSize(fm.horizontalAdvance(m_text),
+                    fm.boundingRect(m_text).height());
+    }
+    case MultiLine: {
+        int maxWidth = 0;
+        int totalHeight = 0;
+        for (const QString& text : m_textList) {
+            maxWidth = qMax(maxWidth, fm.horizontalAdvance(text));
+            totalHeight += fm.boundingRect(text).height();
+        }
+
+        return QSize(maxWidth, totalHeight);
+    }
+    }
+
+    Q_UNREACHABLE_RETURN(QSize(0, 0));
+}
+
 bool TipsWidget::event(QEvent *event)
 {
     if (event->type() == QEvent::FontChange) {
-        switch (m_type) {
-        case SingleLine:
-        {
-            setText(m_text);
-            break;
-        }
-        case MultiLine:
-        {
-            setTextList(m_textList);
-            break;
-        }
-        }
+        updateGeometry();
+        update();
     } else if (event->type() == QEvent::MouseButtonRelease
                && static_cast<QMouseEvent *>(event)->button() == Qt::RightButton) {
         return true;
     }
     return QFrame::event(event);
 }
+
+QSize TipsWidget::minimumSizeHint() const
+{
+    return sizeHint();
+}
+
 }

plugins/dde-dock/widgets/tipswidget.h

@@ -22,10 +22,12 @@ class TipsWidget : public QFrame
     const QStringList &textList() { return  m_textList; }
     void setText(const QString &text);
     void setTextList(const QStringList &textList);
+    QSize sizeHint() const override;
 
 protected:
     void paintEvent(QPaintEvent *event) override;
     bool event(QEvent *event) override;
+    QSize minimumSizeHint() const override;
 
 private:
     QString m_text;

src/loader/pluginitem.cpp

@@ -334,10 +334,7 @@ QWidget * PluginItem::itemTooltip(const QString &itemKey)
         // add content margin, tooltip popup do not need to set padding
         layout->setContentsMargins(8, 4, 8, 4);
         layout->addWidget(toolTip);
-        // fixme: 这个设置会导致widget resize, 当任务栏在右的时候，窗口变化会会遮住鼠标导致leaveEvent触发，tooltip消失
-        if (itemKey.contains("network")) {
-            layout->setSizeConstraint(QLayout::SetFixedSize);
-        }
+        layout->setSizeConstraint(QLayout::SetFixedSize);
         toolTip->setVisible(true);
     } else {
         // can update tooltip content