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

ctlIME // Make candidateFont() static.

This commit is contained in:
ShikiSuen 2022-08-22 07:56:51 +08:00
parent 0dd1f834a0
commit ccb5468dc7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Modules/ControllerModules/ctlInputMethod_HandleDisplay.swift
View File

@ -91,7 +91,7 @@ extension ctlInputMethod {
ctlInputMethod.ctlCandidateCurrent.keyLabelFont = labelFont( ctlInputMethod.ctlCandidateCurrent.keyLabelFont = labelFont(
name: mgrPrefs.candidateKeyLabelFontName, size: keyLabelSize name: mgrPrefs.candidateKeyLabelFontName, size: keyLabelSize
) )
ctlInputMethod.ctlCandidateCurrent.candidateFont = candidateFont( ctlInputMethod.ctlCandidateCurrent.candidateFont = ctlInputMethod.candidateFont(
name: mgrPrefs.candidateTextFontName, size: textSize name: mgrPrefs.candidateTextFontName, size: textSize
) )
@ -168,7 +168,7 @@ extension ctlInputMethod {
/// 5) Do NOT enable either KangXi conversion mode nor JIS conversion mode. They are disabled by default. /// 5) Do NOT enable either KangXi conversion mode nor JIS conversion mode. They are disabled by default.
/// 6) Expecting the glyph differences of the candidate "骨" between PingFang SC and PingFang TC when rendering /// 6) Expecting the glyph differences of the candidate "骨" between PingFang SC and PingFang TC when rendering
/// the candidate window in different "vChewing-CHS" and "vChewing-CHT" input modes. /// the candidate window in different "vChewing-CHS" and "vChewing-CHT" input modes.
func candidateFont(name: String?, size: CGFloat) -> NSFont { static func candidateFont(name: String? = nil, size: CGFloat) -> NSFont {
let finalReturnFont: NSFont = let finalReturnFont: NSFont =
{ {
switch IME.currentInputMode { switch IME.currentInputMode {
@ -183,7 +183,7 @@ extension ctlInputMethod {
} }
}() }()
?? NSFont.systemFont(ofSize: size) ?? NSFont.systemFont(ofSize: size)
if let name = name { if let name = name, !name.isEmpty {
return NSFont(name: name, size: size) ?? finalReturnFont return NSFont(name: name, size: size) ?? finalReturnFont
} }
return finalReturnFont return finalReturnFont