diff --git a/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift b/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift index 30981dd6..ed7bb2b9 100644 --- a/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift +++ b/Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift @@ -44,7 +44,7 @@ public protocol PrefMgrProtocol { var clientsIMKTextInputIncapable: [String: Bool] { get set } var onlyLoadFactoryLangModelsIfNeeded: Bool { get set } var useIMKCandidateWindow: Bool { get set } - var handleDefaultCandidateFontsByLangIdentifier: Bool { get set } + var legacyCandidateViewTypesettingMethodEnabled: Bool { get set } var disableSegmentedThickUnderlineInMarkingModeForManagedClients: Bool { get set } var maxCandidateLength: Int { get set } var shouldNotFartInLieuOfBeep: Bool { get set } diff --git a/Packages/vChewing_Shared/Sources/Shared/Shared.swift b/Packages/vChewing_Shared/Sources/Shared/Shared.swift index 6214668c..87046666 100644 --- a/Packages/vChewing_Shared/Sources/Shared/Shared.swift +++ b/Packages/vChewing_Shared/Sources/Shared/Shared.swift @@ -72,7 +72,7 @@ public enum UserDef: String, CaseIterable { case kClassicHaninKeyboardSymbolModeShortcutEnabled = "ClassicHaninKeyboardSymbolModeShortcutEnabled" case kUseIMKCandidateWindow = "UseIMKCandidateWindow" - case kHandleDefaultCandidateFontsByLangIdentifier = "HandleDefaultCandidateFontsByLangIdentifier" + case kLegacyCandidateViewTypesettingMethodEnabled = "LegacyCandidateViewTypesettingMethodEnabled" case kDisableSegmentedThickUnderlineInMarkingModeForManagedClients = "DisableSegmentedThickUnderlineInMarkingModeForManagedClients" diff --git a/Source/Modules/PrefMgr_Core.swift b/Source/Modules/PrefMgr_Core.swift index 5ba2ee70..49ac08b0 100644 --- a/Source/Modules/PrefMgr_Core.swift +++ b/Source/Modules/PrefMgr_Core.swift @@ -179,8 +179,8 @@ public class PrefMgr: PrefMgrProtocol { @AppProperty(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false) public var useIMKCandidateWindow: Bool - @AppProperty(key: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue, defaultValue: false) - public var handleDefaultCandidateFontsByLangIdentifier: Bool + @AppProperty(key: UserDef.kLegacyCandidateViewTypesettingMethodEnabled.rawValue, defaultValue: false) + public var legacyCandidateViewTypesettingMethodEnabled: Bool @AppProperty( key: UserDef.kDisableSegmentedThickUnderlineInMarkingModeForManagedClients.rawValue, diff --git a/Source/Modules/PrefMgr_Extension.swift b/Source/Modules/PrefMgr_Extension.swift index c57ce9aa..6760bd84 100644 --- a/Source/Modules/PrefMgr_Extension.swift +++ b/Source/Modules/PrefMgr_Extension.swift @@ -15,7 +15,7 @@ public extension PrefMgr { // macOS 10.15 開始才能使用 SwiftUI 構建的田所選字窗。 if #unavailable(macOS 10.15) { useIMKCandidateWindow = true - handleDefaultCandidateFontsByLangIdentifier = false + legacyCandidateViewTypesettingMethodEnabled = false togglingAlphanumericalModeWithRShift = false togglingAlphanumericalModeWithLShift = false showReverseLookupInCandidateUI = false diff --git a/Source/Modules/SessionCtl_HandleDisplay.swift b/Source/Modules/SessionCtl_HandleDisplay.swift index c6770549..2885b21d 100644 --- a/Source/Modules/SessionCtl_HandleDisplay.swift +++ b/Source/Modules/SessionCtl_HandleDisplay.swift @@ -111,7 +111,7 @@ public extension SessionCtl { isVerticalTyping ? "⇧" : NSLocalizedString("Hold ⇧ to choose associates.", comment: "") } - candidateUI?.useLangIdentifier = PrefMgr.shared.handleDefaultCandidateFontsByLangIdentifier + candidateUI?.useLangIdentifier = PrefMgr.shared.legacyCandidateViewTypesettingMethodEnabled candidateUI?.locale = { switch inputMode { case .imeModeCHS: return "zh-Hans"