openkylin
/
qtbase-opensource-src
mirror of https://gitee.com/openkylin/qtbase-opensource-src.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix:#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确

This commit is contained in:
liuyapeng 2023-11-08 17:40:32 +08:00 committed by openkylin-cibot
parent 7faab2c757
commit aa936dabd9
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
qtbase-opensource-src (5.15.8+dfsg-ok2.3) nile; urgency=medium
* BUG号：
#I79FD0【文件管理器】【wayland】侧边栏悬停显示位置不正确
* 需求号：无
* 其他更改：
-- liuyapeng <liuyapeng@kylinos.cn> Wed, 08 Nov 2023 17:39:16 +0800
qtbase-opensource-src (5.15.8+dfsg-ok2.2) nile; urgency=medium
* BUG号：无

37
debian/patches/0037-bugfix-I79FD0-wayland.patch vendored Normal file
View File

@ -0,0 +1,37 @@
From: liuyapeng <liuyapeng@kylinos.cn>
Date: Wed, 8 Nov 2023 17:40:32 +0800
Subject: =?utf-8?b?YnVnZml4OiNJNzlGRDDjgJDmlofku7bnrqHnkIblmajjgJHjgJB3YXls?=
=?utf-8?b?YW5k44CR5L6n6L655qCP5oKs5YGc5pi+56S65L2N572u5LiN5q2j56Gu?=
---
src/widgets/kernel/qtooltip.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index add2a44..84054d4 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -508,14 +508,15 @@ 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);
- }
+ // 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();
return;
}
}

1
debian/patches/series vendored
View File

@ -34,3 +34,4 @@ revert_startBlocking_removal.diff
0034-update-debian-changelog.patch
0035-update-debian-changelog.patch
0036-update-debian-changelog-to-5.15.8-dfsg-ok2.2.patch
0037-bugfix-I79FD0-wayland.patch