From b86ab53f089de5ea80988b2847c03a5e1f42309e Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 9 Mar 2022 12:07:34 +0800 Subject: [PATCH] ctlIME // Disable Sarasa Gothic dependency on macOS 12 and later. --- Source/Modules/IMEModules/ctlInputMethod.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Modules/IMEModules/ctlInputMethod.swift b/Source/Modules/IMEModules/ctlInputMethod.swift index 9b306bbf..ae1f6a90 100644 --- a/Source/Modules/IMEModules/ctlInputMethod.swift +++ b/Source/Modules/IMEModules/ctlInputMethod.swift @@ -563,7 +563,9 @@ extension ctlInputMethod { 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) + var finalReturnFont = NSFont(name: currentMUIFont, size: size) ?? NSFont.systemFont(ofSize: size) + // 對更紗黑體的依賴到 macOS 11 Big Sur 為止。macOS 12 Monterey 開始則依賴系統內建的函數使用蘋方來處理。 + if #available(macOS 12.0, *) {finalReturnFont = NSFont.systemFont(ofSize: size)} if let name = name { return NSFont(name: name, size: size) ?? finalReturnFont }