diff --git a/Source/Data b/Source/Data
index 8090069b..ed8e8f37 160000
--- a/Source/Data
+++ b/Source/Data
@@ -1 +1 @@
-Subproject commit 8090069bc5eefa2a58ade7dda1aaadb0d11855e9
+Subproject commit ed8e8f37aeff477a242f4ad345d5b2cfa85e0cf0
diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift
index e020b95e..9b306bbf 100644
--- a/Source/Modules/IMEModules/ctlInputMethod.swift
+++ b/Source/Modules/IMEModules/ctlInputMethod.swift
@@ -554,15 +554,24 @@ extension ctlInputMethod {
let textSize = Preferences.candidateListTextSize
let keyLabelSize = max(textSize / 2, kMinKeyLabelSize)
- func font(name: String?, size: CGFloat) -> NSFont {
+ func labelFont(name: String?, size: CGFloat) -> NSFont {
if let name = name {
return NSFont(name: name, size: size) ?? NSFont.systemFont(ofSize: size)
}
return NSFont.systemFont(ofSize: size)
}
- gCurrentCandidateController?.keyLabelFont = font(name: Preferences.candidateKeyLabelFontName, size: keyLabelSize)
- gCurrentCandidateController?.candidateFont = font(name: Preferences.candidateTextFontName, size: textSize)
+ func candidateFont(name: String?, size: CGFloat) -> NSFont {
+ let currentMUIFont = (keyHandler.inputMode == InputMode.imeModeCHS) ? "Sarasa Term Slab SC" : "Sarasa Term Slab TC"
+ let finalReturnFont = NSFont(name: currentMUIFont, size: size) ?? NSFont.systemFont(ofSize: size)
+ if let name = name {
+ return NSFont(name: name, size: size) ?? finalReturnFont
+ }
+ return finalReturnFont
+ }
+
+ gCurrentCandidateController?.keyLabelFont = labelFont(name: Preferences.candidateKeyLabelFontName, size: keyLabelSize)
+ gCurrentCandidateController?.candidateFont = candidateFont(name: Preferences.candidateTextFontName, size: textSize)
let candidateKeys = Preferences.candidateKeys
let keyLabels = candidateKeys.count > 4 ? Array(candidateKeys) : Array(Preferences.defaultCandidateKeys)
diff --git a/Update-Info.plist b/Update-Info.plist
index e4ade5b1..538c7ebd 100644
--- a/Update-Info.plist
+++ b/Update-Info.plist
@@ -7,7 +7,7 @@
UpdateInfoSite
https://gitee.com/vChewing/vChewing-macOS/releases
CFBundleVersion
- 1927
+ 1928
CFBundleShortVersionString
1.3.7
diff --git a/vChewing.xcodeproj/project.pbxproj b/vChewing.xcodeproj/project.pbxproj
index 7658f9d0..eef59a57 100644
--- a/vChewing.xcodeproj/project.pbxproj
+++ b/vChewing.xcodeproj/project.pbxproj
@@ -1205,7 +1205,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1926;
+ CURRENT_PROJECT_VERSION = 1928;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
@@ -1218,7 +1218,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "UserPhraseEditor/PhraseEditor-Info.plist";
- INFOPLIST_KEY_CFBundleDisplayName = "$(PRODUCT_NAME)";
+ INFOPLIST_KEY_CFBundleDisplayName = vChewingPhraseEditor;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_KEY_NSHumanReadableCopyright = "© 2021-2022 vChewing Project.";
INFOPLIST_KEY_NSMainStoryboardFile = Main;
@@ -1258,7 +1258,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1926;
+ CURRENT_PROJECT_VERSION = 1928;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1266,7 +1266,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "UserPhraseEditor/PhraseEditor-Info.plist";
- INFOPLIST_KEY_CFBundleDisplayName = "$(PRODUCT_NAME)";
+ INFOPLIST_KEY_CFBundleDisplayName = vChewingPhraseEditor;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
INFOPLIST_KEY_NSHumanReadableCopyright = "© 2021-2022 vChewing Project.";
INFOPLIST_KEY_NSMainStoryboardFile = Main;
@@ -1388,7 +1388,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1926;
+ CURRENT_PROJECT_VERSION = 1928;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1453,7 +1453,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1926;
+ CURRENT_PROJECT_VERSION = 1928;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = "";
@@ -1562,7 +1562,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1927;
+ CURRENT_PROJECT_VERSION = 1928;
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -1612,7 +1612,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 1927;
+ CURRENT_PROJECT_VERSION = 1928;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu99;