From 9c7fd57a18ae71a56af7db23b5f7f4761c2847c3 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Mon, 30 Aug 2021 22:21:36 +0800
Subject: [PATCH] Improved tray icon search and tooltip

---
 src/systemtray/statusnotifieritemsource.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/systemtray/statusnotifieritemsource.cpp b/src/systemtray/statusnotifieritemsource.cpp
index 1c2ed5e..e651183 100644
--- a/src/systemtray/statusnotifieritemsource.cpp
+++ b/src/systemtray/statusnotifieritemsource.cpp
@@ -245,11 +245,22 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call)
         m_title = properties[QStringLiteral("Title")].toString();
         m_iconName = properties[QStringLiteral("IconName")].toString();
 
+        // Reion: For icon theme path
+        QString iconThemePath = properties[QStringLiteral("IconThemePath")].toString();
+        if (!iconThemePath.isEmpty()) {
+            QIcon::setFallbackSearchPaths(QStringList() << iconThemePath);
+        }
+
         // ToolTip
         KDbusToolTipStruct toolTip;
         properties[QStringLiteral("ToolTip")].value<QDBusArgument>() >> toolTip;
         m_tooltip = toolTip.title;
 
+        // Use ID as an alternative :)
+        if (m_tooltip.isEmpty() && m_title.isEmpty()) {
+            m_tooltip = properties[QStringLiteral("Id")].toString();
+        }
+
         // Icon
         KDbusImageVector image;
         properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image;