optimize icon acquisition logic to prepare for customizing icons for …

…other desktop environments in the future
fcitx · Sep 20, 2024 · 6785ead · 6785ead
1 parent 9ab829b
commit 6785ead
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/modules/notificationitem/notificationitem.cpp b/src/modules/notificationitem/notificationitem.cpp
@@ -53,20 +53,24 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
     }
     void activate(int, int) { parent_->instance()->toggle(); }
     void secondaryActivate(int, int) {}
-    std::string iconName() {
-        static bool preferSymbolic = !isKDE();
-        std::string icon;
-        if (preferSymbolic) {
-            icon = "input-keyboard-symbolic";
+    std::string customIconForDesktop() const {
+        if (isKDE()) {
+            return "input-keyboard";
         } else {
-            icon = "input-keyboard";
+            return "input-keyboard-symbolic";
         }
+    }
+    std::string iconName() {
+        std::string icon;
+
         if (auto *ic = parent_->menu()->lastRelevantIc()) {
             icon = parent_->instance()->inputMethodIcon(ic);
         }
-        if (icon == "input-keyboard" && preferSymbolic) {
-            return "input-keyboard-symbolic";
+
+        if (icon.empty() || icon == "input-keyboard") {
+            icon = customIconForDesktop();
         }
+
         return IconTheme::iconName(icon);
     }