X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystraynotificationbackend.cpp;h=cb409ae2bee6bf5f968264813d0743372288c04a;hp=b6d1ff5f7811a55227aa191bccb463969f95a12b;hb=3013f4e095802e906c85878436da9e2ee3f9028c;hpb=ffc0d75cea1690acb5428fb4f1ee0e82b5f4c9ef diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp index b6d1ff5f..cb409ae2 100644 --- a/src/qtui/systraynotificationbackend.cpp +++ b/src/qtui/systraynotificationbackend.cpp @@ -79,7 +79,7 @@ void SystrayNotificationBackend::close(uint notificationId) { QtUi::mainWindow()->systemTray()->closeMessage(notificationId); - if(!_notifications.count()) + //if(!_notifications.count()) //FIXME make configurable QtUi::mainWindow()->systemTray()->setAlert(false); updateToolTip(); @@ -87,8 +87,9 @@ void SystrayNotificationBackend::close(uint notificationId) { void SystrayNotificationBackend::notificationActivated(uint notificationId) { if(!_blockActivation) { - if(QtUi::mainWindow()->systemTray()->isAlerted()) { - _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal + if(_notifications.count()) { + if(QtUi::mainWindow()->systemTray()->mode() == SystemTray::Legacy) + _blockActivation = true; // prevent double activation because both tray icon and bubble might send a signal if(!notificationId) notificationId = _notifications.count()? _notifications.last().notificationId : 0; emit activated(notificationId);