X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=230b19df6aeaeb7ca5323a89cc8924880d966fd4;hp=ca88ca7461e074019549f67149eb8d89359e2ac8;hb=d45d1044c030312878cb648fd1325ce70b079c44;hpb=9fd26b13faa28f44d3d82b92e41d83c753cd0297
diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index ca88ca74..230b19df 100644
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.cpp
@@ -27,7 +27,6 @@
LegacySystemTray::LegacySystemTray(QWidget *parent)
: SystemTray(parent),
_blinkState(false),
- _isVisible(true),
_lastMessageId(0)
{
#ifndef HAVE_KDE
@@ -66,18 +65,21 @@ void LegacySystemTray::syncLegacyIcon() {
#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("%1").arg(toolTipTitle());
-#endif
if(!toolTipSubTitle().isEmpty())
- tooltip += QString("\n%1").arg(toolTipSubTitle());
+ tooltip += QString("
%1").arg(toolTipSubTitle());
+#endif
+
_trayIcon->setToolTip(tooltip);
}
void LegacySystemTray::setVisible(bool visible) {
- _isVisible = visible;
+ SystemTray::setVisible(visible);
if(mode() == Legacy) {
- if(visible)
+ if(shouldBeVisible())
_trayIcon->show();
else
_trayIcon->hide();
@@ -88,16 +90,21 @@ bool LegacySystemTray::isVisible() const {
if(mode() == Legacy) {
return _trayIcon->isVisible();
}
- return false;
+ return SystemTray::isVisible();
}
void LegacySystemTray::setMode(Mode mode_) {
+ if(mode_ == mode())
+ return;
+
SystemTray::setMode(mode_);
if(mode() == Legacy) {
syncLegacyIcon();
- if(_isVisible)
+ if(shouldBeVisible())
_trayIcon->show();
+ else
+ _trayIcon->hide();
if(state() == NeedsAttention)
_blinkTimer.start();
} else {