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

IMKCandidates // Make page-flipping keys work.

This commit is contained in:
ShikiSuen 2022-08-13 19:39:51 +08:00
parent 4b0a0e516a
commit 129ac56797
1 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift
View File

@ -113,7 +113,12 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol {
currentPageIndex = (currentPageIndex + 1 >= pageCount) ? 0 : currentPageIndex + 1 currentPageIndex = (currentPageIndex + 1 >= pageCount) ? 0 : currentPageIndex + 1
if selectedCandidateIndex == candidates(self).count - 1 { return false } if selectedCandidateIndex == candidates(self).count - 1 { return false }
selectedCandidateIndex = min(selectedCandidateIndex + keyCount, candidates(self).count - 1) selectedCandidateIndex = min(selectedCandidateIndex + keyCount, candidates(self).count - 1)
pageDownAndModifySelection(self) switch currentLayout {
case .horizontal:
moveDown(self)
case .vertical:
moveRight(self)
}
return true return true
} }
@ -124,7 +129,12 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol {
currentPageIndex = (currentPageIndex == 0) ? pageCount - 1 : currentPageIndex - 1 currentPageIndex = (currentPageIndex == 0) ? pageCount - 1 : currentPageIndex - 1
if selectedCandidateIndex == 0 { return true } if selectedCandidateIndex == 0 { return true }
selectedCandidateIndex = max(selectedCandidateIndex - keyCount, 0) selectedCandidateIndex = max(selectedCandidateIndex - keyCount, 0)
pageUpAndModifySelection(self) switch currentLayout {
case .horizontal:
moveUp(self)
case .vertical:
moveLeft(self)
}
return true return true
} }
@ -233,8 +243,39 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol {
let event = eventArray[0] let event = eventArray[0]
let input = InputSignal(event: event) let input = InputSignal(event: event)
guard let delegate = delegate else { return } guard let delegate = delegate else { return }
if input.isEsc || input.isBackSpace || input.isDelete || input.isShiftHold { if input.isEsc || input.isBackSpace || input.isDelete || (input.isShiftHold && !input.isSpace) {
_ = delegate.handleDelegateEvent(event) _ = delegate.handleDelegateEvent(event)
} else if input.isSymbolMenuPhysicalKey || input.isSpace {
if input.isShiftHold {
switch currentLayout {
case .horizontal:
moveUp(self)
case .vertical:
moveLeft(self)
}
} else {
switch currentLayout {
case .horizontal:
moveDown(self)
case .vertical:
moveRight(self)
}
}
} else if input.isTab {
switch currentLayout {
case .horizontal:
if input.isShiftHold {
moveLeft(self)
} else {
moveRight(self)
}
case .vertical:
if input.isShiftHold {
moveUp(self)
} else {
moveDown(self)
}
}
} else { } else {
super.interpretKeyEvents(eventArray) super.interpretKeyEvents(eventArray)
} }