X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=ca88ca7461e074019549f67149eb8d89359e2ac8;hp=0c6a1e3609cc277527e6d4c55f3ce3f3f7532152;hb=e17270ce8d77a28ed7253c474289c68c2e7facf0;hpb=5ba28fb36a747bd9a2c05a58f0533d1e38c2a0de diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp index 0c6a1e36..ca88ca74 100644 --- a/src/qtui/legacysystemtray.cpp +++ b/src/qtui/legacysystemtray.cpp @@ -64,9 +64,13 @@ void LegacySystemTray::init() { void LegacySystemTray::syncLegacyIcon() { _trayIcon->setIcon(stateIcon()); +#if defined Q_WS_MAC || defined Q_WS_WIN + QString tooltip = QString("%1").arg(toolTipTitle()); +#else QString tooltip = QString("%1").arg(toolTipTitle()); +#endif if(!toolTipSubTitle().isEmpty()) - tooltip += QString("
%1").arg(toolTipSubTitle()); + tooltip += QString("\n%1").arg(toolTipSubTitle()); _trayIcon->setToolTip(tooltip); } @@ -106,7 +110,7 @@ void LegacySystemTray::setState(State state_) { State oldstate = state(); SystemTray::setState(state_); if(oldstate != state()) { - if(state() == NeedsAttention && mode() == Legacy) + if(state() == NeedsAttention && mode() == Legacy && animationEnabled()) _blinkTimer.start(); else { _blinkTimer.stop();