summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel
diff options
context:
space:
mode:
authorMatthias Rauter <matthias.rauter@qt.io>2023-02-03 08:09:15 +0100
committerMatthias Rauter <matthias.rauter@qt.io>2023-02-07 18:23:03 +0100
commit285c326ef4070b768f7a6ef7a38fb2c2976fe572 (patch)
treeb1c9ab9b2246cd77ba10d39784e3f1ee8ad6dd79 /src/widgets/kernel
parent9f36ab1f8df7f79ffb78259725110106aa5a8e37 (diff)
Use plain text to calculate expire time of tooltips
Fixes: QTBUG-110735 Pick-to: 6.5 Change-Id: I3f0db04f3be9707167f7c19507ebbb5a9c4466d2 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r--src/widgets/kernel/qtooltip.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 3166613199..2c68b029b0 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -157,7 +157,9 @@ QTipLabel::QTipLabel(const QString &text, const QPoint &pos, QWidget *w, int mse
void QTipLabel::restartExpireTimer(int msecDisplayTime)
{
- int time = 10000 + 40 * qMax(0, text().size()-100);
+ Q_D(const QLabel);
+ const qsizetype textLength = d->needTextControl() ? d->control->toPlainText().size() : text().size();
+ qsizetype time = 10000 + 40 * qMax(0, textLength - 100);
if (msecDisplayTime > 0)
time = msecDisplayTime;
expireTimer.start(time, this);