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

KeyHandler // Use fixed order for inline candidate rotation.

This commit is contained in:
ShikiSuen 2022-06-27 10:29:58 +08:00
parent 9acbdaebe4
commit 171c43c36c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ class KeyHandler {
} }
/// 獲取候選字詞陣列資料內容。 /// 獲取候選字詞陣列資料內容。
var candidatesArray: [String] { func candidatesArray(fixOrder: Bool = true) -> [String] {
var arrNodes: [Megrez.NodeAnchor] = rawNodes var arrNodes: [Megrez.NodeAnchor] = rawNodes
var arrCandidates: [String] = [] var arrCandidates: [String] = []
@ -262,7 +262,7 @@ class KeyHandler {
} }
} }
} }
if mgrPrefs.fetchSuggestionsFromUserOverrideModel, !mgrPrefs.useSCPCTypingMode { if mgrPrefs.fetchSuggestionsFromUserOverrideModel, !mgrPrefs.useSCPCTypingMode, !fixOrder {
let arrSuggestedUnigrams: [Megrez.Unigram] = fetchSuggestedCandidates().stableSort { $0.score > $1.score } let arrSuggestedUnigrams: [Megrez.Unigram] = fetchSuggestedCandidates().stableSort { $0.score > $1.score }
let arrSuggestedCandidates: [String] = arrSuggestedUnigrams.map(\.keyValue.value) let arrSuggestedCandidates: [String] = arrSuggestedUnigrams.map(\.keyValue.value)
arrCandidates = arrSuggestedCandidates.filter { arrCandidates.contains($0) } + arrCandidates arrCandidates = arrSuggestedCandidates.filter { arrCandidates.contains($0) } + arrCandidates

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

@ -169,7 +169,7 @@ extension KeyHandler {
InputState.ChoosingCandidate( InputState.ChoosingCandidate(
composingBuffer: currentState.composingBuffer, composingBuffer: currentState.composingBuffer,
cursorIndex: currentState.cursorIndex, cursorIndex: currentState.cursorIndex,
candidates: candidatesArray, candidates: candidatesArray(fixOrder: false),
isTypingVertical: isTypingVertical isTypingVertical: isTypingVertical
) )
} }
@ -772,8 +772,7 @@ extension KeyHandler {
return true return true
} }
// 此處僅借用該函式生成結果內的某個物件，不用糾結「是否縱排輸入」。 let candidates = candidatesArray(fixOrder: true)
let candidates = candidatesArray
guard !candidates.isEmpty else { guard !candidates.isEmpty else {
IME.prtDebugIntel("3378A6DF") IME.prtDebugIntel("3378A6DF")
errorCallback() errorCallback()