From 2a33d94861d318e1d9a4e201a0f78118d90128e7 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 13 Dec 2023 16:24:03 +0100 Subject: [PATCH] Do not output html tooltips on win, mac --- src/modules/trayicon/libkvitrayicon.cpp | 20 +++++++++++--------- src/modules/trayicon/libkvitrayicon.h | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 075fcc8ac..ae3c4a4e6 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -205,7 +205,7 @@ static const char * idlemsgs[] = { static const std::size_t NIDLEMSGS = sizeof(idlemsgs) / sizeof(*idlemsgs); -const QString KviTrayIconWidget::getToolTipText() +const QString KviTrayIconWidget::getToolTipText(bool bHtml) { QString szTmp; @@ -225,16 +225,18 @@ const QString KviTrayIconWidget::getToolTipText() if(!line.isEmpty()) { if(!first) - szTmp += "

\n"; + szTmp += bHtml ? "

\n" : "\n\n"; else first = false; - line.replace(QChar('&'), "&"); - line.replace(QChar('<'), "<"); - line.replace(QChar('>'), ">"); - szTmp += ""; + if(bHtml) { + line.replace(QChar('&'), "&"); + line.replace(QChar('<'), "<"); + line.replace(QChar('>'), ">"); + szTmp += ""; + } szTmp += b->kviWindow()->plainTextCaption(); - szTmp += "
"; + szTmp += bHtml ? "

" : "\n"; szTmp += line; } } @@ -473,9 +475,9 @@ void KviTrayIconWidget::refresh() updateIcon(); #ifdef COMPILE_KDE_SUPPORT - setToolTipSubTitle(getToolTipText()); + setToolTipSubTitle(getToolTipText(true)); #else - setToolTip(getToolTipText()); + setToolTip(getToolTipText(false)); #endif } diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h index 7c65fc35d..d90ec44ba 100644 --- a/src/modules/trayicon/libkvitrayicon.h +++ b/src/modules/trayicon/libkvitrayicon.h @@ -86,7 +86,7 @@ class KviTrayIconWidget final private: void grabActivityInfo(); - const QString getToolTipText(); + const QString getToolTipText(bool bHtml); private slots: void fillContextPopup(); void toggleParentFrame();