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

mgrPrefs // +shiftKeyAccomodationBehavior.

This commit is contained in:
ShikiSuen 2022-09-01 22:16:40 +08:00
parent 667cd84441
commit aa39fe3017
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Modules/IMEModules/mgrPrefs.swift
View File

@ -58,7 +58,7 @@ public enum UserDef: String, CaseIterable {
case kUseIMKCandidateWindow = "UseIMKCandidateWindow" case kUseIMKCandidateWindow = "UseIMKCandidateWindow"
case kHandleDefaultCandidateFontsByLangIdentifier = "HandleDefaultCandidateFontsByLangIdentifier" case kHandleDefaultCandidateFontsByLangIdentifier = "HandleDefaultCandidateFontsByLangIdentifier"
case kShouldAlwaysUseShiftKeyAccommodation = "ShouldAlwaysUseShiftKeyAccommodation" case kShiftKeyAccommodationBehavior = "ShiftKeyAccommodationBehavior"
case kCandidateTextFontName = "CandidateTextFontName" case kCandidateTextFontName = "CandidateTextFontName"
case kCandidateKeyLabelFontName = "CandidateKeyLabelFontName" case kCandidateKeyLabelFontName = "CandidateKeyLabelFontName"
@ -316,7 +316,7 @@ public enum mgrPrefs {
forKey: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue forKey: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue
) )
UserDefaults.standard.setDefault( UserDefaults.standard.setDefault(
mgrPrefs.shouldAlwaysUseShiftKeyAccommodation, forKey: UserDef.kShouldAlwaysUseShiftKeyAccommodation.rawValue mgrPrefs.shiftKeyAccommodationBehavior, forKey: UserDef.kShiftKeyAccommodationBehavior.rawValue
) )
// ----- // -----
@ -438,7 +438,6 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kTrimUnfinishedReadingsOnCommit.rawValue, defaultValue: true) @UserDefault(key: UserDef.kTrimUnfinishedReadingsOnCommit.rawValue, defaultValue: true)
static var trimUnfinishedReadingsOnCommit: Bool static var trimUnfinishedReadingsOnCommit: Bool
// MARK: - Settings (Tier 2) // MARK: - Settings (Tier 2)
@UserDefault(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false) @UserDefault(key: UserDef.kUseIMKCandidateWindow.rawValue, defaultValue: false)
@ -447,8 +446,8 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue, defaultValue: false) @UserDefault(key: UserDef.kHandleDefaultCandidateFontsByLangIdentifier.rawValue, defaultValue: false)
static var handleDefaultCandidateFontsByLangIdentifier: Bool static var handleDefaultCandidateFontsByLangIdentifier: Bool
@UserDefault(key: UserDef.kShouldAlwaysUseShiftKeyAccommodation.rawValue, defaultValue: false) @UserDefault(key: UserDef.kShiftKeyAccommodationBehavior.rawValue, defaultValue: 0)
static var shouldAlwaysUseShiftKeyAccommodation: Bool static var shiftKeyAccommodationBehavior: Int
// MARK: - Settings (Tier 3) // MARK: - Settings (Tier 3)
@ -728,7 +727,7 @@ extension mgrPrefs {
} }
if #unavailable(macOS 10.15) { if #unavailable(macOS 10.15) {
mgrPrefs.handleDefaultCandidateFontsByLangIdentifier = false mgrPrefs.handleDefaultCandidateFontsByLangIdentifier = false
mgrPrefs.shouldAlwaysUseShiftKeyAccommodation = false mgrPrefs.shiftKeyAccommodationBehavior = 0
mgrPrefs.disableShiftTogglingAlphanumericalMode = false mgrPrefs.disableShiftTogglingAlphanumericalMode = false
mgrPrefs.togglingAlphanumericalModeWithLShift = false mgrPrefs.togglingAlphanumericalModeWithLShift = false
} }
@ -768,6 +767,9 @@ extension mgrPrefs {
if ![0, 1, 2].contains(upperCaseLetterKeyBehavior) { if ![0, 1, 2].contains(upperCaseLetterKeyBehavior) {
upperCaseLetterKeyBehavior = 0 upperCaseLetterKeyBehavior = 0
} }
if ![0, 1, 2].contains(shiftKeyAccommodationBehavior) {
shiftKeyAccommodationBehavior = 0
}
} }
} }