X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=9176dbd769f2951c309b91f908f7778e69e5619e;hp=0c6a1e3609cc277527e6d4c55f3ce3f3f7532152;hb=f266d6afd50d03b21b136b6a34454c49d55878cf;hpb=5ba28fb36a747bd9a2c05a58f0533d1e38c2a0de

diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index 0c6a1e36..9176dbd7 100644
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.cpp
@@ -64,9 +64,16 @@ void LegacySystemTray::init() {
 void LegacySystemTray::syncLegacyIcon() {
   _trayIcon->setIcon(stateIcon());
 
+#if defined Q_WS_MAC || defined Q_WS_WIN
+  QString tooltip = QString("%1").arg(toolTipTitle());
+  if(!toolTipSubTitle().isEmpty())
+    tooltip += QString("\n%1").arg(toolTipSubTitle());
+#else
   QString tooltip = QString("<b>%1</b>").arg(toolTipTitle());
   if(!toolTipSubTitle().isEmpty())
     tooltip += QString("<br>%1").arg(toolTipSubTitle());
+#endif
+
   _trayIcon->setToolTip(tooltip);
 }
 
@@ -106,7 +113,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();