From e97ca4f020884526740314fbad8ba573199531b7 Mon Sep 17 00:00:00 2001 From: hanpinlong Date: Sun, 9 Jun 2024 10:38:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?tooltip=E6=A6=82=E7=8E=87=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widgets/kernel/qtooltip.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 84054d40..add2a44e 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -508,15 +508,14 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons else if (!QTipLabel::instance->fadingOut){ // If the tip has changed, reuse the one // that is showing (removes flickering) - // QPoint localPos = pos; - // if (w) - // localPos = w->mapFromGlobal(pos); - // if (QTipLabel::instance->tipChanged(localPos, text, w)){ - // QTipLabel::instance->reuseTip(text, msecDisplayTime, pos); - // QTipLabel::instance->setTipRect(w, rect); - // QTipLabel::instance->placeTip(pos, w); - // } - QTipLabel::instance->hideTip(); + QPoint localPos = pos; + if (w) + localPos = w->mapFromGlobal(pos); + if (QTipLabel::instance->tipChanged(localPos, text, w)){ + QTipLabel::instance->reuseTip(text, msecDisplayTime, pos); + QTipLabel::instance->setTipRect(w, rect); + QTipLabel::instance->placeTip(pos, w); + } return; } } From 818b32888abc2845c7c1127d107c6b2146ee2dd6 Mon Sep 17 00:00:00 2001 From: hanpinlong Date: Sun, 9 Jun 2024 14:20:36 +0800 Subject: [PATCH 2/2] udpate changelog to 5.15.10+dfsg-3ok2.6 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a27ec3a..ce707c2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +qtbase-opensource-src (5.15.10+dfsg-3ok2.6) nile; urgency=medium + + * BUG号：无 + * 需求号：无 + * 其他更改：tooltip概率不显示问题 + + -- hanpinlong Sun, 09 Jun 2024 14:19:32 +0800 + qtbase-opensource-src (5.15.10+dfsg-3ok2.5) nile; urgency=medium * BUG号：无