Use keyman icon for input method. (#1)

fcitx · Nov 19, 2022 · 7bea13f · 7bea13f
1 parent 432e51d
commit 7bea13f
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/engine.cpp b/src/engine.cpp
@@ -276,13 +276,22 @@ std::vector<InputMethodEntry> KeymanEngine::listInputMethods() {
     }
     std::vector<InputMethodEntry> result;
     for (auto &[id, keyboard] : keyboards) {
+        std::string icon = "km-config";
+        // Check if icon file exists, otherwise fallback to keyman's icon.
+        for (auto *suffix : {".bmp.png", ".icon.png"}) {
+            auto path = stringutils::joinPath(keyboard->baseDir,
+                                              stringutils::concat(id, suffix));
+            if (fs::isreg(path)) {
+                icon = std::move(path);
+                break;
+            }
+        }
+
         result.emplace_back(stringutils::concat("keyman:", id),
                             stringutils::concat(keyboard->name, " (Keyman)"),
                             keyboard->language, "keyman");
-        result.back()
-            .setIcon("km-config")
-            .setConfigurable(true)
-            .setUserData(std::move(keyboard));
+        result.back().setIcon(icon).setConfigurable(true).setUserData(
+            std::move(keyboard));
     }
     return result;
 }