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

Prefs // +legacyCandidateViewTypesettingMethodEnabled.

This commit is contained in:
ShikiSuen 2023-02-22 17:23:42 +08:00
parent b91ecde609
commit 6319465f32
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/vChewing_Shared/Sources/Shared/Protocols/PrefMgrProtocol.swift
View File

@ -44,7 +44,7 @@ public protocol PrefMgrProtocol {
var clientsIMKTextInputIncapable: [String: Bool] { get set } var clientsIMKTextInputIncapable: [String: Bool] { get set }
var onlyLoadFactoryLangModelsIfNeeded: Bool { get set } var onlyLoadFactoryLangModelsIfNeeded: Bool { get set }
var useIMKCandidateWindow: Bool { get set } var useIMKCandidateWindow: Bool { get set }
var handleDefaultCandidateFontsByLangIdentifier: Bool { get set } var legacyCandidateViewTypesettingMethodEnabled: Bool { get set }
var disableSegmentedThickUnderlineInMarkingModeForManagedClients: Bool { get set } var disableSegmentedThickUnderlineInMarkingModeForManagedClients: Bool { get set }
var maxCandidateLength: Int { get set } var maxCandidateLength: Int { get set }
var shouldNotFartInLieuOfBeep: Bool { get set } var shouldNotFartInLieuOfBeep: Bool { get set }

2
Packages/vChewing_Shared/Sources/Shared/Shared.swift
View File

@ -72,7 +72,7 @@ public enum UserDef: String, CaseIterable {
case kClassicHaninKeyboardSymbolModeShortcutEnabled = "ClassicHaninKeyboardSymbolModeShortcutEnabled" case kClassicHaninKeyboardSymbolModeShortcutEnabled = "ClassicHaninKeyboardSymbolModeShortcutEnabled"
case kUseIMKCandidateWindow = "UseIMKCandidateWindow" case kUseIMKCandidateWindow = "UseIMKCandidateWindow"
case kHandleDefaultCandidateFontsByLangIdentifier = "HandleDefaultCandidateFontsByLangIdentifier" case kLegacyCandidateViewTypesettingMethodEnabled = "LegacyCandidateViewTypesettingMethodEnabled"
case kDisableSegmentedThickUnderlineInMarkingModeForManagedClients case kDisableSegmentedThickUnderlineInMarkingModeForManagedClients
= "DisableSegmentedThickUnderlineInMarkingModeForManagedClients" = "DisableSegmentedThickUnderlineInMarkingModeForManagedClients"

4
Source/Modules/PrefMgr_Core.swift
View File

@ -179,8 +179,8 @@ public class PrefMgr: PrefMgrProtocol {
@AppProperty(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false) @AppProperty(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false)
public var useIMKCandidateWindow: Bool public var useIMKCandidateWindow: Bool
@AppProperty(key: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue, defaultValue: false) @AppProperty(key: UserDef.kLegacyCandidateViewTypesettingMethodEnabled.rawValue, defaultValue: false)
public var handleDefaultCandidateFontsByLangIdentifier: Bool public var legacyCandidateViewTypesettingMethodEnabled: Bool
@AppProperty( @AppProperty(
key: UserDef.kDisableSegmentedThickUnderlineInMarkingModeForManagedClients.rawValue, key: UserDef.kDisableSegmentedThickUnderlineInMarkingModeForManagedClients.rawValue,

2
Source/Modules/PrefMgr_Extension.swift
View File

@ -15,7 +15,7 @@ public extension PrefMgr {
// macOS 10.15 開始才能使用 SwiftUI 構建的田所選字窗。 // macOS 10.15 開始才能使用 SwiftUI 構建的田所選字窗。
if #unavailable(macOS 10.15) { if #unavailable(macOS 10.15) {
useIMKCandidateWindow = true useIMKCandidateWindow = true
handleDefaultCandidateFontsByLangIdentifier = false legacyCandidateViewTypesettingMethodEnabled = false
togglingAlphanumericalModeWithRShift = false togglingAlphanumericalModeWithRShift = false
togglingAlphanumericalModeWithLShift = false togglingAlphanumericalModeWithLShift = false
showReverseLookupInCandidateUI = false showReverseLookupInCandidateUI = false

2
Source/Modules/SessionCtl_HandleDisplay.swift
View File

@ -111,7 +111,7 @@ public extension SessionCtl {
isVerticalTyping ? "⇧" : NSLocalizedString("Hold ⇧ to choose associates.", comment: "") isVerticalTyping ? "⇧" : NSLocalizedString("Hold ⇧ to choose associates.", comment: "")
} }
candidateUI?.useLangIdentifier = PrefMgr.shared.handleDefaultCandidateFontsByLangIdentifier candidateUI?.useLangIdentifier = PrefMgr.shared.legacyCandidateViewTypesettingMethodEnabled
candidateUI?.locale = { candidateUI?.locale = {
switch inputMode { switch inputMode {
case .imeModeCHS: return "zh-Hans" case .imeModeCHS: return "zh-Hans"