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

Repo // Patch choosing states to conform previous update.

This commit is contained in:
ShikiSuen 2022-08-05 09:11:20 +08:00
parent 0c7df04dba
commit 9699580b57
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Modules/ControllerModules/InputState.swift
View File

@ -429,10 +429,13 @@ public enum InputState {
private(set) var candidates: [(String, String)] private(set) var candidates: [(String, String)]
private(set) var isTypingVertical: Bool private(set) var isTypingVertical: Bool
init(composingBuffer: String, cursorIndex: Int, candidates: [(String, String)], isTypingVertical: Bool) { init(
composingBuffer: String, cursorIndex: Int, candidates: [(String, String)], isTypingVertical: Bool,
nodeValuesArray: [String] = []
) {
self.candidates = candidates self.candidates = candidates
self.isTypingVertical = isTypingVertical self.isTypingVertical = isTypingVertical
super.init(composingBuffer: composingBuffer, cursorIndex: cursorIndex) super.init(composingBuffer: composingBuffer, cursorIndex: cursorIndex, nodeValuesArray: nodeValuesArray)
} }
override var description: String { override var description: String {

9
Source/Modules/ControllerModules/KeyHandler_States.swift
View File

@ -22,7 +22,7 @@ extension KeyHandler {
/// 「更新內文組字區 (Update the composing buffer)」是指要求客體軟體將組字緩衝區的內容 /// 「更新內文組字區 (Update the composing buffer)」是指要求客體軟體將組字緩衝區的內容
/// 換成由此處重新生成的組字字串（NSAttributeString，否則會不顯示）。 /// 換成由此處重新生成的組字字串（NSAttributeString，否則會不顯示）。
var tooltipParameterRef: [String] = ["", ""] var tooltipParameterRef: [String] = ["", ""]
let nodeValuesArray: [String] = walkedAnchors.map(\.node.currentPair.value) let nodeValuesArray: [String] = walkedAnchors.values
var composedStringCursorIndex = 0 var composedStringCursorIndex = 0
var readingCursorIndex = 0 var readingCursorIndex = 0
/// IMK 協定的內文組字區的游標長度與游標位置無法正確統計 UTF8 高萬字（比如 emoji）的長度， /// IMK 協定的內文組字區的游標長度與游標位置無法正確統計 UTF8 高萬字（比如 emoji）的長度，
@ -124,7 +124,8 @@ extension KeyHandler {
composingBuffer: currentState.composingBuffer, composingBuffer: currentState.composingBuffer,
cursorIndex: currentState.cursorIndex, cursorIndex: currentState.cursorIndex,
candidates: getCandidatesArray(fixOrder: mgrPrefs.useFixecCandidateOrderOnSelection), candidates: getCandidatesArray(fixOrder: mgrPrefs.useFixecCandidateOrderOnSelection),
isTypingVertical: isTypingVertical isTypingVertical: isTypingVertical,
nodeValuesArray: walkedAnchors.values
) )
} }
@ -196,7 +197,7 @@ extension KeyHandler {
cursorIndex: state.cursorIndex, cursorIndex: state.cursorIndex,
markerIndex: index, markerIndex: index,
readings: state.readings, readings: state.readings,
nodeValuesArray: walkedAnchors.map(\.node.currentPair.value) nodeValuesArray: walkedAnchors.values
) )
marking.tooltipForInputting = state.tooltipForInputting marking.tooltipForInputting = state.tooltipForInputting
stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking) stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking)
@ -218,7 +219,7 @@ extension KeyHandler {
cursorIndex: state.cursorIndex, cursorIndex: state.cursorIndex,
markerIndex: index, markerIndex: index,
readings: state.readings, readings: state.readings,
nodeValuesArray: walkedAnchors.map(\.node.currentPair.value) nodeValuesArray: walkedAnchors.values
) )
marking.tooltipForInputting = state.tooltipForInputting marking.tooltipForInputting = state.tooltipForInputting
stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking) stateCallback(marking.markedRange.isEmpty ? marking.convertedToInputting : marking)