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

ctlIME // Simplify symbol menu processings for IMKCandidates.

This commit is contained in:
ShikiSuen 2022-08-27 15:10:43 +08:00
parent 8678eb81ad
commit 254934b219
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Modules/ControllerModules/ctlInputMethod_Core.swift
View File

@ -313,9 +313,15 @@ class ctlInputMethod: IMKInputController {
if let state = state as? InputState.AssociatedPhrases {
handleCandidatesPrepared(state.candidates, prefix: "⇧")
} else if let state = state as? InputState.SymbolTable {
handleCandidatesPrepared(state.candidates)
// 分類符號選單不會出現同符異音項、不需要康熙 / JIS 轉換，所以使用簡化過的處理方式。
arrResult = state.candidates.map(\.1)
} else if let state = state as? InputState.ChoosingCandidate {
handleCandidatesPrepared(state.candidates)
guard !state.candidates.isEmpty else { return .init() }
if state.candidates[0].0.contains("_punctuation") {
arrResult = state.candidates.map(\.1) // 標點符號選單處理。
} else {
handleCandidatesPrepared(state.candidates)
}
}
return arrResult
@ -372,12 +378,27 @@ class ctlInputMethod: IMKInputController {
}
}
// 分類符號選單不會出現同符異音項、不需要康熙 / JIS 轉換，所以使用簡化過的處理方式。
func handleSymbolCandidatesSelected(_ candidates: [(String, String)]) {
for (i, neta) in candidates.enumerated() {
if candidateString.string == neta.1 {
indexDeducted = i
break
}
}
}
if let state = state as? InputState.AssociatedPhrases {
handleCandidatesSelected(state.candidates, prefix: "⇧")
} else if let state = state as? InputState.SymbolTable {
handleCandidatesSelected(state.candidates)
handleSymbolCandidatesSelected(state.candidates)
} else if let state = state as? InputState.ChoosingCandidate {
handleCandidatesSelected(state.candidates)
guard !state.candidates.isEmpty else { return }
if state.candidates[0].0.contains("_punctuation") {
handleSymbolCandidatesSelected(state.candidates) // 標點符號選單處理。
} else {
handleCandidatesSelected(state.candidates)
}
}
keyHandler(
keyHandler,