diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-02 01:00:10 +0100 |
| commit | 6cf3428a43c5744096db0c849aa975c4cb06bd31 (patch) | |
| tree | f7961a992461793ea40781516903c5dd629fe1e5 /src/widgets/kernel/qtooltip.cpp | |
| parent | 529cb7217c0162c31ef6f309730e93612b9798d3 (diff) | |
| parent | b3e91b66b9175c1c3ff5f73f3ac231f74f9bf932 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I42ec9e6aafc203465cbeb88af70c7af26b7df8ed
Diffstat (limited to 'src/widgets/kernel/qtooltip.cpp')
| -rw-r--r-- | src/widgets/kernel/qtooltip.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 1057c9b842..b10ccdd9fe 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -127,6 +127,8 @@ public: ~QTipLabel(); static QTipLabel *instance; + void updateSize(); + bool eventFilter(QObject *, QEvent *) override; QBasicTimer hideTimer, expireTimer; @@ -214,13 +216,18 @@ void QTipLabel::reuseTip(const QString &text, int msecDisplayTime) setWordWrap(Qt::mightBeRichText(text)); setText(text); + updateSize(); + restartExpireTimer(msecDisplayTime); +} + +void QTipLabel::updateSize() +{ QFontMetrics fm(font()); QSize extra(1, 0); // Make it look good with the default ToolTip font on Mac, which has a small descent. if (fm.descent() == 2 && fm.ascent() >= 11) ++extra.rheight(); resize(sizeHint() + extra); - restartExpireTimer(msecDisplayTime); } void QTipLabel::paintEvent(QPaintEvent *ev) @@ -387,6 +394,9 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w) if (w) { connect(w, SIGNAL(destroyed()), QTipLabel::instance, SLOT(styleSheetParentDestroyed())); + // QTBUG-64550: A font inherited by the style sheet might change the size, + // particular on Windows, where the tip is not parented on a window. + QTipLabel::instance->updateSize(); } } #endif //QT_NO_STYLE_STYLESHEET |