floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cltIME // Use Sarasa Gothic to handle MUI candidate fonts. 

- This is only a temporary workaround.
This commit is contained in:
ShikiSuen 2022-03-08 21:25:31 +08:00
parent d61ae19f33
commit 3675eb6772
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Modules/IMEModules/ctlInputMethod.swift
View File

@ -554,15 +554,24 @@ extension ctlInputMethod {
let textSize = Preferences.candidateListTextSize let textSize = Preferences.candidateListTextSize
let keyLabelSize = max(textSize / 2, kMinKeyLabelSize) let keyLabelSize = max(textSize / 2, kMinKeyLabelSize)
func font(name: String?, size: CGFloat) -> NSFont { func labelFont(name: String?, size: CGFloat) -> NSFont {
if let name = name { if let name = name {
return NSFont(name: name, size: size) ?? NSFont.systemFont(ofSize: size) return NSFont(name: name, size: size) ?? NSFont.systemFont(ofSize: size)
} }
return NSFont.systemFont(ofSize: size) return NSFont.systemFont(ofSize: size)
} }
gCurrentCandidateController?.keyLabelFont = font(name: Preferences.candidateKeyLabelFontName, size: keyLabelSize) func candidateFont(name: String?, size: CGFloat) -> NSFont {
gCurrentCandidateController?.candidateFont = font(name: Preferences.candidateTextFontName, size: textSize) 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 candidateKeys = Preferences.candidateKeys
let keyLabels = candidateKeys.count > 4 ? Array(candidateKeys) : Array(Preferences.defaultCandidateKeys) let keyLabels = candidateKeys.count > 4 ? Array(candidateKeys) : Array(Preferences.defaultCandidateKeys)