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

KeyHandler // Improve Alt+Fwd/Bwd support.

This commit is contained in:
ShikiSuen 2022-07-12 15:55:18 +08:00
parent c89636e12a
commit 5f654c842e
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,8 +375,8 @@ class KeyHandler {
/// 組字器的游標位置。
var compositorCursorIndex: Int {
get { compositor.cursorIndex }
set { compositor.cursorIndex = newValue }
get { compositor.cursor }
set { compositor.cursor = newValue }
}
/// 組字器的目前的長度。

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

@ -662,14 +662,14 @@ extension KeyHandler {
stateCallback(state)
}
} else if input.isOptionHold {
if compositorCursorIndex < compositorLength {
compositorCursorIndex = nextPhrasePosition
stateCallback(buildInputtingState)
} else {
// 游標跳轉動作無論怎樣都會執行，但如果出了執行失敗的結果的話則觸發報錯流程。
if !compositor.jumpCursorBySpan(to: .front) {
IME.prtDebugIntel("33C3B580")
errorCallback()
stateCallback(state)
return true
}
stateCallback(buildInputtingState)
} else {
if compositorCursorIndex < compositorLength {
compositorCursorIndex += 1
@ -727,17 +727,14 @@ extension KeyHandler {
stateCallback(state)
}
} else if input.isOptionHold {
if compositorCursorIndex > 1 {
compositorCursorIndex -= 2
stateCallback(buildInputtingState)
} else if compositorCursorIndex == 1 {
compositorCursorIndex = 0
stateCallback(buildInputtingState)
} else {
// 游標跳轉動作無論怎樣都會執行，但如果出了執行失敗的結果的話則觸發報錯流程。
if !compositor.jumpCursorBySpan(to: .rear) {
IME.prtDebugIntel("8D50DD9E")
errorCallback()
stateCallback(state)
return true
}
stateCallback(buildInputtingState)
} else {
if compositorCursorIndex > 0 {
compositorCursorIndex -= 1