fix: 暗黑模式修复和增加开关

解决暗黑模式主题字体颜色问题，增加是否在行内显示预编辑区的开关
hugh7007 · Apr 9, 2024 · 059760b · 059760b
1 parent 0813711
commit 059760b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/squirrel.yaml b/squirrel.yaml
@@ -147,7 +147,7 @@ preset_color_schemes:
     hilited_comment_text_color: 0xffffff    # 选中注颜色
     text_color: 0x6495ed                    # 拼音颜色 （inline_preedit: false）
     hilited_text_color: 0xc6c01a            # 选中拼音颜色 （inline_preedit: false）
-    CatDark: {author: ProudCat, back_color: 0x242424, border_color: 0x00e0e0e0, candidate_back_color: 0x242424, candidate_shadow_color: 0x00000000, candidate_text_color: 0x99ffffff, comment_text_color: 0x55ffffff, hilited_back_color: 0x00d4d4d4, hilited_candidate_back_color: 0xfa3a0a, hilited_candidate_shadow_color: 0x00000000, hilited_candidate_text_color: 0xe5ffffff, hilited_comment_text_color: 0xc5c5c5, hilited_label_color: 0xe5ffffff, hilited_shadow_color: 0x00000000, hilited_text_color: 0x000000, label_color: 0x85ffffff, name: "Cat暗黑/CatDark", shadow_color: 0x00000000, text_color: 0xe5ffffff}
+    CatDark: {author: ProudCat, back_color: 0x242424, border_color: 0x00e0e0e0, candidate_back_color: 0x242424, candidate_shadow_color: 0x00000000, candidate_text_color: 0x99ffffff, comment_text_color: 0x55ffffff, hilited_back_color: 0x00d4d4d4, hilited_candidate_back_color: 0xfa3a0a, hilited_candidate_shadow_color: 0x00000000, hilited_candidate_text_color: 0xe5ffffff, hilited_comment_text_color: 0xc5c5c5, hilited_label_color: 0xe5ffffff, hilited_shadow_color: 0x00000000, hilited_text_color: 0xe5ffffff, label_color: 0x85ffffff, name: "Cat暗黑/CatDark", shadow_color: 0x00000000, text_color: 0xe5ffffff}
     CatLight: {author: ProudCat, back_color: 0xf3f3f3, border_color: 0x00e0e0e0, candidate_back_color: 0xf3f3f3, candidate_shadow_color: 0x00000000, candidate_text_color: 0x4b4b4b, comment_text_color: 0x4b4b4b, hilited_back_color: 0x00d4d4d4, hilited_candidate_back_color: 0xff571f, hilited_candidate_shadow_color: 0x00000000, hilited_candidate_text_color: 0xffffff, hilited_comment_text_color: 0xc5c5c5, hilited_label_color: 0xc5c5c5, hilited_shadow_color: 0x00000000, hilited_text_color: 0x000000, label_color: 0x4b4b4b, name: "Cat光明/CatLight", shadow_color: 0x00000000, text_color: 0x000000}
   wechat_light:
     name: 微信键盘浅色
@@ -366,7 +366,7 @@ preset_color_schemes:
   MacRoseo: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0x33000000, candidate_back_color: 0xFFFFFF, candidate_border_color: 0x00000000, candidate_shadow_color: 0x00000000, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xEDEDF9, hilited_candidate_back_color: 0x004F11FA, hilited_candidate_border_color: 0x004F11FA, hilited_candidate_shadow_color: 0x004F11FA, hilited_candidate_text_color: 0x4F11FA, hilited_label_color: 0x884F11FA, hilited_mark_color: 0x000000, hilited_shadow_color: 0xcccccc, hilited_text_color: 0x000000, label_color: 0x999999, name: "玫红 / MacRoseo", nextpage_color: 0x000000, prevpage_color: 0x000000, shadow_color: 0x44000000, text_color: 0x000000}
   MacRoseoAlt: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0xD6D6D6, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xFFFFFF, hilited_candidate_back_color: 0x4F11FA, hilited_candidate_text_color: 0xFFFFFF, hilited_text_color: 0x000000, name: MacRoseo, text_color: 0x000000}
   WhiteAqua: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0xD6D6D6, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xFFFFFF, hilited_candidate_back_color: 0x9BAD23, hilited_candidate_text_color: 0xFFFFFF, hilited_text_color: 0x000000, name: WhiteAqua, text_color: 0x000000}
-  wechat_dark: {back_color: 0x2e2925, candidate_format: "%c %@ ", candidate_text_color: 0xe9e9ea, comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, label_color: 0x999999, name: "微信键盘深色", text_color: 0x424242}
+  wechat_dark: {back_color: 0x2e2925, candidate_format: "%c %@ ", candidate_text_color: 0xe9e9ea, comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, label_color: 0x999999, name: "微信键盘深色", text_color: 0x424242, hilited_text_color: 0xFFFFFF}
   wechat_light: {back_color: 0xFFFFFF, border_height: 0, border_width: 8, candidate_format: "%c %@ ", comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, name: "微信键盘浅色", text_color: 0x424242}
   white: {back_color: 0xededed, border_color: 0x40444444, candidate_shadow_color: 0x60444444, candidate_text_color: 0x444444, comment_text_color: 0x444444, hilited_candidate_back_color: 0x444444, hilited_candidate_shadow_color: 0x60444444, hilited_candidate_text_color: 0xededed, hilited_comment_text_color: 0xededed, hilited_label_color: 0xededed, hilited_shadow_color: 0x60444444, hilited_text_color: 0x000000, label_color: 0x444444, name: "白色/white", shadow_color: 0x60444444}
   win10_MDL_ayaya: {author: "Lufs X <i@isteed.cc>", back_color: 0xFFFFFF, candidate_text_color: 0x121212, comment_text_color: 0x8E8E8E, hilited_candidate_back_color: 0xECE4FC, hilited_candidate_text_color: 0x7A40EC, hilited_label_color: 0xB18FF4, label_color: 0x888785, name: "Windows10 文文／Ayaya", text_color: 0x8100EB}

diff --git a/weasel.yaml b/weasel.yaml
@@ -678,15 +678,15 @@ preset_color_schemes:
     hilited_comment_text_color: 0xc5c5c5          #高亮候选编码提示文字颜色d
     label_color: 0x4b4b4b                         #非高亮候选数字颜色
     hilited_label_color: 0xc5c5c5                 #高亮候选数字颜色
-
+ 
   CatDark:
     name: Cat暗黑/CatDark
     author: ProudCat
     text_color: 0xe5ffffff                          #默认文字颜色
     back_color: 0x242424                          #候选窗背景色
     shadow_color: 0x00000000                      #候选窗阴影色，默认全透明（无阴影）
     border_color: 0x00e0e0e0                        #候选窗边框颜色
-    hilited_text_color: 0x000000                  #编码文字颜色
+    hilited_text_color: 0xe5ffffff                  #编码文字颜色   
     hilited_back_color: 0x00d4d4d4                  #编码背景颜色
     hilited_shadow_color: 0x00000000              #编码背景块阴影颜色
     hilited_candidate_text_color: 0xe5ffffff        #高亮候选文字颜色
@@ -719,7 +719,7 @@ preset_color_schemes:
   MacRoseo: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0x33000000, candidate_back_color: 0xFFFFFF, candidate_border_color: 0x00000000, candidate_shadow_color: 0x00000000, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xEDEDF9, hilited_candidate_back_color: 0x004F11FA, hilited_candidate_border_color: 0x004F11FA, hilited_candidate_shadow_color: 0x004F11FA, hilited_candidate_text_color: 0x4F11FA, hilited_label_color: 0x884F11FA, hilited_mark_color: 0x000000, hilited_shadow_color: 0xcccccc, hilited_text_color: 0x000000, label_color: 0x999999, name: "玫红 / MacRoseo", nextpage_color: 0x000000, prevpage_color: 0x000000, shadow_color: 0x44000000, text_color: 0x000000}
   MacRoseoAlt: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0xD6D6D6, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xFFFFFF, hilited_candidate_back_color: 0x4F11FA, hilited_candidate_text_color: 0xFFFFFF, hilited_text_color: 0x000000, name: MacRoseo, text_color: 0x000000}
   WhiteAqua: {author: KyleBing, back_color: 0xFFFFFF, border_color: 0xD6D6D6, candidate_text_color: 0x000000, comment_text_color: 0xBBCC27, creat_time: "2021-07-26", hilited_back_color: 0xFFFFFF, hilited_candidate_back_color: 0x9BAD23, hilited_candidate_text_color: 0xFFFFFF, hilited_text_color: 0x000000, name: WhiteAqua, text_color: 0x000000}
-  wechat_dark: {back_color: 0x2e2925, candidate_format: "%c %@ ", candidate_text_color: 0xe9e9ea, comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, label_color: 0x999999, name: "微信键盘深色", text_color: 0x424242}
+  wechat_dark: {back_color: 0x2e2925, candidate_format: "%c %@ ", candidate_text_color: 0xe9e9ea, comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, label_color: 0x999999, name: "微信键盘深色", text_color: 0x424242, hilited_text_color: 0xFFFFFF}
   wechat_light: {back_color: 0xFFFFFF, border_height: 0, border_width: 8, candidate_format: "%c %@ ", comment_text_color: 0x999999, hilited_candidate_back_color: 0x75B100, hilited_candidate_text_color: 0xFFFFFF, inline_preedit: true, name: "微信键盘浅色", text_color: 0x424242}
   white: {back_color: 0xededed, border_color: 0x40444444, candidate_shadow_color: 0x60444444, candidate_text_color: 0x444444, comment_text_color: 0x444444, hilited_candidate_back_color: 0x444444, hilited_candidate_shadow_color: 0x60444444, hilited_candidate_text_color: 0xededed, hilited_comment_text_color: 0xededed, hilited_label_color: 0xededed, hilited_shadow_color: 0x60444444, hilited_text_color: 0x000000, label_color: 0x444444, name: "白色/white", shadow_color: 0x60444444}
   win10_MDL_ayaya: {author: "Lufs X <i@isteed.cc>", back_color: 0xFFFFFF, candidate_text_color: 0x121212, comment_text_color: 0x8E8E8E, hilited_candidate_back_color: 0xECE4FC, hilited_candidate_text_color: 0x7A40EC, hilited_label_color: 0xB18FF4, label_color: 0x888785, name: "Windows10 文文／Ayaya", text_color: 0x8100EB}

diff --git a/xmjd6.custom.yaml b/xmjd6.custom.yaml
@@ -6,6 +6,8 @@ patch:
   hint_text: ''    #顶功提示符→在两个<''>中间添加符号，例如hint_text: '🔞'
   style/horizontal: false  #竖排为false横排为true
   menu/page_size: 5   #候选项数
+  style/color_scheme_dark: CatDark # 此处可修改暗黑模式主题
+  style/inline_preedit: false                    # 行内显示预编辑区：true；false
 
 
   #                         0选择第一个,1选择第二个