File 0004-Show-application-title-if-Status-Notifier-... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-Show-application-title-if-Status-Notifier-Item-does-.patch of Package plasma5-workspace (Revision 704a942a50f43bfd2029bdc90f4a226f)

Currently displaying revision 704a942a50f43bfd2029bdc90f4a226f , Show latest

From 909f1f1ad82248aea6581f8b6576675877ea18b5 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Sun, 28 Sep 2014 19:41:15 +0200
Subject: [PATCH 4/5] Show application title if Status Notifier Item does not
 provide a tooltip

A custom tooltip text is not mandated by the SNI spec. Instead, we just show
the application name and icon if none is given.
This fixes Steam not having a tooltip and restores Plasma 4.x behavior.

REVIEW: 120407
BUG: 337710
FIXED-IN: 5.1
---
 .../dbussystemtray/dbussystemtraytask.cpp          | 42 ++++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
index 14458e9..f878ffd 100644
--- a/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
+++ b/applets/systemtray/plugin/protocols/dbussystemtray/dbussystemtraytask.cpp
@@ -420,22 +420,42 @@ void DBusSystemTrayTask::syncIcons(const Plasma::DataEngine::Data &properties)
 
 void DBusSystemTrayTask::syncToolTip(const QString &title, const QString &subTitle, const QIcon &toolTipIcon)
 {
-    if (title != m_tooltipTitle) {
-        m_tooltipTitle = title;
-        emit changedTooltipTitle();
-    }
+    if (title.isEmpty() && subTitle.isEmpty()) {
+        // if empty tooltip use application name as fallback
+        if (m_tooltipTitle != name()) {
+            m_tooltipTitle = name();
+            emit changedTooltipTitle();
+        }
+
+        if (!m_tooltipText.isEmpty()) {
+            m_tooltipText.clear();
+            emit changedTooltipText();
+        }
+    } else {
+        if (title != m_tooltipTitle) {
+            m_tooltipTitle = title;
+            emit changedTooltipTitle();
+        }
 
-    if (subTitle != m_tooltipText) {
-        m_tooltipText = subTitle;
-        emit changedTooltipText();
+        if (subTitle != m_tooltipText) {
+            m_tooltipText = subTitle;
+            emit changedTooltipText();
+        }
     }
 
-    bool is_icon_name_changed = (m_tooltipIcon.name() != toolTipIcon.name());
+    bool iconNameChanged = false;
 
-    m_tooltipIcon = toolTipIcon;
-    emit changedTooltip();
+    if (toolTipIcon.isNull()) {
+        iconNameChanged = m_tooltipIcon.name() != m_icon.name();
+        m_tooltipIcon = m_icon;
+    } else {
+        iconNameChanged = m_tooltipIcon.name() != toolTipIcon.name();
+        m_tooltipIcon = toolTipIcon;
+        emit changedTooltip();
+    }
 
-    if (is_icon_name_changed) {
+    emit changedTooltip();
+    if (iconNameChanged) {
         emit changedTooltipIconName();
     }
 }
-- 
2.1.0

Places

File 0004-Show-application-title-if-Status-Notifier-Item-does-.patch of Package plasma5-workspace (Revision 704a942a50f43bfd2029bdc90f4a226f)

Places