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

mgrPrefs // setRearCursorMode -> useRearCursorMode.

This commit is contained in:
ShikiSuen 2022-05-31 14:02:53 +08:00
parent 3b5100a72d
commit c0dde5d633
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Modules/ControllerModules/KeyHandler_Core.swift
View File

@ -161,7 +161,7 @@ class KeyHandler {
}
func fixNode(value: String, respectCursorPushing: Bool = true) {
let cursorIndex = min(actualCandidateCursorIndex + (mgrPrefs.setRearCursorMode ? 1 : 0), builderLength)
let cursorIndex = min(actualCandidateCursorIndex + (mgrPrefs.useRearCursorMode ? 1 : 0), builderLength)
let selectedNode: Megrez.NodeAnchor = _builder.grid.fixNodeSelectedCandidate(
location: cursorIndex, value: value
)
@ -244,7 +244,7 @@ class KeyHandler {
IME.prtDebugIntel(
"UOM: Suggestion retrieved, overriding the node score of the selected candidate.")
_builder.grid.overrideNodeScoreForSelectedCandidate(
location: min(actualCandidateCursorIndex + (mgrPrefs.setRearCursorMode ? 1 : 0), builderLength),
location: min(actualCandidateCursorIndex + (mgrPrefs.useRearCursorMode ? 1 : 0), builderLength),
value: overrideValue,
overridingScore: findHighestScore(nodes: rawNodes, epsilon: kEpsilon)
)
@ -310,7 +310,7 @@ class KeyHandler {
var rawNodes: [Megrez.NodeAnchor] {
/// 警告：不要對游標前置風格使用 nodesCrossing，否則會導致游標行為與 macOS 內建注音輸入法不一致。
/// 微軟新注音輸入法的游標後置風格也是不允許 nodeCrossing 的。
mgrPrefs.setRearCursorMode
mgrPrefs.useRearCursorMode
? _builder.grid.nodesBeginningAt(location: actualCandidateCursorIndex)
: _builder.grid.nodesEndingAt(location: actualCandidateCursorIndex)
}

2
Source/Modules/ControllerModules/KeyHandler_Misc.swift
View File

@ -35,7 +35,7 @@ extension KeyHandler {
var actualCandidateCursorIndex: Int {
var cursorIndex = builderCursorIndex
switch mgrPrefs.setRearCursorMode {
switch mgrPrefs.useRearCursorMode {
case false:
do {
// macOS built-in Zhuyin style.

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

@ -37,7 +37,7 @@ struct UserDef {
static let kCandidateListTextSize = "CandidateListTextSize"
static let kAppleLanguages = "AppleLanguages"
static let kShouldAutoReloadUserDataFiles = "ShouldAutoReloadUserDataFiles"
static let kSetRearCursorMode = "SetRearCursorMode"
static let kuseRearCursorMode = "useRearCursorMode"
static let kUseHorizontalCandidateList = "UseHorizontalCandidateList"
static let kComposingBufferSize = "ComposingBufferSize"
static let kChooseCandidateUsingSpace = "ChooseCandidateUsingSpace"
@ -245,7 +245,7 @@ public enum mgrPrefs {
UserDefaults.standard.setDefault(mgrPrefs.useSCPCTypingMode, forKey: UserDef.kUseSCPCTypingMode)
UserDefaults.standard.setDefault(mgrPrefs.associatedPhrasesEnabled, forKey: UserDef.kAssociatedPhrasesEnabled)
UserDefaults.standard.setDefault(
mgrPrefs.setRearCursorMode, forKey: UserDef.kSetRearCursorMode
mgrPrefs.useRearCursorMode, forKey: UserDef.kuseRearCursorMode
)
UserDefaults.standard.setDefault(
mgrPrefs.moveCursorAfterSelectingCandidate, forKey: UserDef.kMoveCursorAfterSelectingCandidate
@ -322,8 +322,8 @@ public enum mgrPrefs {
@UserDefault(key: UserDef.kShouldAutoReloadUserDataFiles, defaultValue: true)
static var shouldAutoReloadUserDataFiles: Bool
@UserDefault(key: UserDef.kSetRearCursorMode, defaultValue: false)
static var setRearCursorMode: Bool
@UserDefault(key: UserDef.kuseRearCursorMode, defaultValue: false)
static var useRearCursorMode: Bool
@UserDefault(key: UserDef.kMoveCursorAfterSelectingCandidate, defaultValue: true)
static var moveCursorAfterSelectingCandidate: Bool

4
Source/UI/PrefUI/suiPrefPaneExperience.swift
View File

@ -32,7 +32,7 @@ struct suiPrefPaneExperience: View {
(UserDefaults.standard.string(forKey: UserDef.kCandidateKeys) ?? mgrPrefs.defaultCandidateKeys) as String
@State private var selCursorPosition =
UserDefaults.standard.bool(
forKey: UserDef.kSetRearCursorMode) ? 1 : 0
forKey: UserDef.kuseRearCursorMode) ? 1 : 0
@State private var selPushCursorAfterSelection = UserDefaults.standard.bool(
forKey: UserDef.kMoveCursorAfterSelectingCandidate)
@State private var selKeyBehaviorShiftTab =
@ -112,7 +112,7 @@ struct suiPrefPaneExperience: View {
Text(LocalizedStringKey("in front of the phrase (like macOS built-in Zhuyin IME)")).tag(0)
Text(LocalizedStringKey("at the rear of the phrase (like Microsoft New Phonetic)")).tag(1)
}.onChange(of: selCursorPosition) { value in
mgrPrefs.setRearCursorMode = (value == 1) ? true : false
mgrPrefs.useRearCursorMode = (value == 1) ? true : false
}
.labelsHidden()
.pickerStyle(RadioGroupPickerStyle())