v5: Fix to avoid affecting other UI styles for GNOME 3.38

Remove unwanted style if the IBus related style classes (.candidate-*) style
block is shared with other styles that has nothing to do with IBus style

Signed-off-by: Hollow Man <hollowman@hollowman.ml>

Author: HollowMan6

customize-ibus@hollowman.ml/extension.js

@@ -300,10 +300,11 @@ const IBusThemeManager = GObject.registerClass(
         }
 
         for (var index in matchedContent) {
-          newFileContent +=
+          newFileContent += this._rmUnrelatedStyleClass(
             matchedContent[index]
               .replace(/assets\//g, stylesheet + "/../assets/")
-              .replace(/.button/g, ".candidate-page-button") + "\n";
+              .replace(/.button/g, ".candidate-page-button") + "\n"
+          );
         }
         regStr = /\n.candidate-[\s\S]*?}/gi;
         matchedContent = ByteArray.toString(contents).match(regStr);
@@ -341,29 +342,32 @@ const IBusThemeManager = GObject.registerClass(
           ) {
             newContent = newContent.replace(/}/g, "  border-image: none;\n}");
           }
-          newFileContent +=
+          newFileContent += this._rmUnrelatedStyleClass(
             newContent
               .replace(/assets\//g, stylesheet + "/../assets/")
-              .replace(/}/g, addedGlobalColor) + "\n";
+              .replace(/}/g, addedGlobalColor) + "\n"
+          );
         }
         regStr = /.horizontal .candidate-[\s\S]*?}/gi;
         matchedContent = ByteArray.toString(contents).match(regStr);
         for (var index in matchedContent) {
-          newFileContent +=
+          newFileContent += this._rmUnrelatedStyleClass(
             matchedContent[index].replace(
               // Set assert file relative path to absolute path
               /assets\//g,
               stylesheet + "/../assets/"
-            ) + "\n";
+            ) + "\n"
+          );
         }
         regStr = /.vertical .candidate-[\s\S]*?}/gi;
         matchedContent = ByteArray.toString(contents).match(regStr);
         for (var index in matchedContent) {
-          newFileContent +=
+          newFileContent += this._rmUnrelatedStyleClass(
             matchedContent[index].replace(
               /assets\//g,
               stylesheet + "/../assets/"
-            ) + "\n";
+            ) + "\n"
+          );
         }
         this._prevCssStylesheet = stylesheet;
       } else {
@@ -397,6 +401,24 @@ const IBusThemeManager = GObject.registerClass(
       if (notFirstStart) this.restart();
     }
 
+    // Fix to avoid affecting other UI styles
+
+    /* Remove unwanted style if the IBus related style classes (.candidate-*) style 
+       block is shared with other styles that has nothing to do with IBus style 
+    */
+
+    _rmUnrelatedStyleClass(str) {
+      let splitedContent = str.split("{");
+      if (splitedContent.length != 2) return splitedContent.join("{");
+      let classList = splitedContent[0].split(",");
+      let contentPart = splitedContent[1];
+      let newClassList = [];
+      for (var index in classList)
+        if (classList[index].indexOf(".candidate-") != -1)
+          newClassList.push(classList[index]);
+      return newClassList.join(",") + "{" + contentPart;
+    }
+
     restart() {
       Meta.restart(_("Restarting..."));
     }

customize-ibus@hollowman.ml/locale/customize-ibus.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Customize Ibus \n"
+"Project-Id-Version: Customize Ibus 5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 23:01+0800\n"
+"POT-Creation-Date: 2021-04-05 17:10+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "loading user theme for IBus:"
 msgstr ""
 
-#: extension.js:370
+#: extension.js:374
 msgid "loading default theme for IBus"
 msgstr ""
 
-#: extension.js:401
+#: extension.js:423
 msgid "Restarting..."
 msgstr ""
 
@@ -69,6 +69,6 @@ msgstr ""
 msgid "Customize IBus"
 msgstr ""
 
-#: prefs.js:353
+#: prefs.js:357
 msgid "Follow User Theme"
 msgstr ""

customize-ibus@hollowman.ml/locale/zh_CN/LC_MESSAGES/customize-ibus.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: customize-ibus 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 23:01+0800\n"
+"POT-Creation-Date: 2021-04-05 17:10+0800\n"
 "PO-Revision-Date: 2021-03-27 16:22+0800\n"
 "Last-Translator: Hollow Man <hollowman@hollowman.ml>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "loading user theme for IBus:"
 msgstr "正在为IBus加载用户主题:"
 
-#: extension.js:370
+#: extension.js:374
 msgid "loading default theme for IBus"
 msgstr "正在为IBus加载当前系统主题"
 
-#: extension.js:401
+#: extension.js:423
 msgid "Restarting..."
 msgstr "正在重新启动⋯⋯"
 
@@ -69,6 +69,6 @@ msgstr "默认"
 msgid "Customize IBus"
 msgstr "自定义IBus"
 
-#: prefs.js:353
+#: prefs.js:357
 msgid "Follow User Theme"
 msgstr "跟随系统主题"

customize-ibus@hollowman.ml/metadata.json

@@ -8,5 +8,5 @@
   "original-authors": ["hollowman@hollowman.ml"],
   "uuid": "customize-ibus@hollowman.ml",
   "extension-id": "customize-ibus",
-  "version": 3
+  "version": 5
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "customize-ibus",
-  "version": "3.0.0",
+  "version": "5.0.0",
   "description": "Customize IBus for orientation, theme, font and ascii mode auto-switch.",
   "dependencies": {
     "eslint": "^7.21.0",