Support empty enum name.

fcitx · Apr 20, 2024 · 80e9d3f · 80e9d3f
1 parent eaa3dcc
commit 80e9d3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/kcm/package/contents/ui/EnumOption.qml b/src/kcm/package/contents/ui/EnumOption.qml
@@ -32,10 +32,13 @@ Row {
     Component.onCompleted: {
         var i = 0;
         while (true) {
-            var value = properties["Enum"][i.toString()];
-            if (!value) {
+            if (!properties.hasOwnProperty("Enum")) {
+                break;
+            }
+            if (!properties["Enum"].hasOwnProperty(i.toString())) {
                 break;
             }
+            var value = properties["Enum"][i.toString()];
             var text = "";
             if (properties.hasOwnProperty("EnumI18n")) {
                 if (properties["EnumI18n"].hasOwnProperty(i.toString())) {

diff --git a/src/kcm/ui/EnumOption.qml b/src/kcm/ui/EnumOption.qml
@@ -35,10 +35,13 @@ Row {
     Component.onCompleted: {
         var i = 0;
         while (true) {
-            var value = properties["Enum"][i.toString()];
-            if (!value) {
+            if (!properties.hasOwnProperty("Enum")) {
+                break;
+            }
+            if (!properties["Enum"].hasOwnProperty(i.toString())) {
                 break;
             }
+            var value = properties["Enum"][i.toString()];
             var text = "";
             if (properties.hasOwnProperty("EnumI18n")) {
                 if (properties["EnumI18n"].hasOwnProperty(i.toString())) {