From 1547207939570de9a5f683d273b6053738059019 Mon Sep 17 00:00:00 2001 From: liuyapeng Date: Fri, 13 Oct 2023 15:18:48 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:#I79FD0=E3=80=90=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=99=A8=E3=80=91=E3=80=90wayland=E3=80=91?= =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=82=AC=E5=81=9C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widgets/kernel/qtooltip.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 0f7bc97c..add2a44e 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -63,6 +63,11 @@ #include #include +#if 0 // Used to be included in Qt4 for Q_WS_MAC +# include +#include +#endif + QT_BEGIN_NAMESPACE /*! @@ -312,7 +317,20 @@ void QTipLabel::timerEvent(QTimerEvent *e) || e->timerId() == expireTimer.timerId()){ hideTimer.stop(); expireTimer.stop(); +#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ && QT_CONFIG(effects) + if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip)){ + // Fade out tip on mac (makes it invisible). + // The tip will not be deleted until a new tip is shown. + + // DRSWAT - Cocoa + macWindowFade(qt_mac_window_for(this)); + QTipLabel::instance->fadingOut = true; // will never be false again. + } + else + hideTipImmediately(); +#else hideTipImmediately(); +#endif } }