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

Prefs // BugFix + Deprecating composingBufferSize.

This commit is contained in:
ShikiSuen 2022-08-08 19:25:16 +08:00
parent b3c1b2b8bc
commit 5073753973
1 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,15 +70,6 @@ private let kDefaultMinKeyLabelSize: CGFloat = 10
private let kMinCandidateListTextSize: CGFloat = 12 private let kMinCandidateListTextSize: CGFloat = 12
private let kMaxCandidateListTextSize: CGFloat = 196 private let kMaxCandidateListTextSize: CGFloat = 196
// default, min and max composing buffer size (in codepoints)
// modern Macs can usually work up to 16 codepoints when the compositor still
// walks the grid with good performance slower Macs (like old PowerBooks)
// will start to sputter beyond 12 such is the algorithmatic complexity
// of the Viterbi algorithm used in the Megrez library (at O(N^2))
private let kDefaultComposingBufferSize = 20
private let kMinComposingBufferSize = 10
private let kMaxComposingBufferSize = 40
private let kDefaultKeys = "123456789" private let kDefaultKeys = "123456789"
// MARK: - UserDefaults extension. // MARK: - UserDefaults extension.
@ -137,34 +128,6 @@ struct CandidateListTextSize {
} }
} }
@propertyWrapper
struct ComposingBufferSize {
let key: String
let defaultValue: Int = kDefaultComposingBufferSize
lazy var container: UserDefault = .init(key: key, defaultValue: defaultValue)
var wrappedValue: Int {
mutating get {
let currentValue = container.wrappedValue
if currentValue < kMinComposingBufferSize {
return kMinComposingBufferSize
} else if currentValue > kMaxComposingBufferSize {
return kMaxComposingBufferSize
}
return currentValue
}
set {
var value = newValue
if value < kMinComposingBufferSize {
value = kMinComposingBufferSize
} else if value > kMaxComposingBufferSize {
value = kMaxComposingBufferSize
}
container.wrappedValue = value
}
}
}
// MARK: - // MARK: -
enum MandarinParser: Int { enum MandarinParser: Int {
@ -388,8 +351,6 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kUseHorizontalCandidateList.rawValue, defaultValue: true) @UserDefault(key: UserDef.kUseHorizontalCandidateList.rawValue, defaultValue: true)
static var useHorizontalCandidateList: Bool static var useHorizontalCandidateList: Bool
static var composingBufferSize: Int { 30 }
@UserDefault(key: UserDef.kChooseCandidateUsingSpace.rawValue, defaultValue: true) @UserDefault(key: UserDef.kChooseCandidateUsingSpace.rawValue, defaultValue: true)
static var chooseCandidateUsingSpace: Bool static var chooseCandidateUsingSpace: Bool
@ -408,7 +369,7 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kAlsoConfirmAssociatedCandidatesByEnter.rawValue, defaultValue: true) @UserDefault(key: UserDef.kAlsoConfirmAssociatedCandidatesByEnter.rawValue, defaultValue: true)
static var alsoConfirmAssociatedCandidatesByEnter: Bool static var alsoConfirmAssociatedCandidatesByEnter: Bool
@UserDefault(key: UserDef.kAlsoConfirmAssociatedCandidatesByEnter.rawValue, defaultValue: false) @UserDefault(key: UserDef.kKeepReadingUponCompositionError.rawValue, defaultValue: false)
static var keepReadingUponCompositionError: Bool static var keepReadingUponCompositionError: Bool
// MARK: - Settings (Tier 2) // MARK: - Settings (Tier 2)