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

Voltaire // Allow back/forward keys to loop candidates.

This commit is contained in:
ShikiSuen 2022-02-23 21:08:31 +08:00
parent f6c65eca4f
commit 50d402822d
2 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/UI/CandidateUI/HorizontalCandidateController.swift
View File

@ -273,29 +273,14 @@ public class HorizontalCandidateController: CandidateController {
} }
public override func highlightNextCandidate() -> Bool { public override func highlightNextCandidate() -> Bool {
guard let delegate = delegate else { guard let delegate = delegate else {return false}
return false selectedCandidateIndex = (selectedCandidateIndex + 1 >= delegate.candidateCountForController(self)) ? 0 : selectedCandidateIndex + 1
}
let currentIndex = selectedCandidateIndex
if currentIndex + 1 >= delegate.candidateCountForController(self) {
return false
}
selectedCandidateIndex = currentIndex + 1
return true return true
} }
public override func highlightPreviousCandidate() -> Bool { public override func highlightPreviousCandidate() -> Bool {
guard delegate != nil else { guard let delegate = delegate else {return false}
return false selectedCandidateIndex = (selectedCandidateIndex == 0) ? delegate.candidateCountForController(self) - 1 : selectedCandidateIndex - 1
}
let currentIndex = selectedCandidateIndex
if currentIndex == 0 {
return false
}
selectedCandidateIndex = currentIndex - 1
return true return true
} }

23
Source/UI/CandidateUI/VerticalCandidateController.swift
View File

@ -279,29 +279,14 @@ public class VerticalCandidateController: CandidateController {
} }
public override func highlightNextCandidate() -> Bool { public override func highlightNextCandidate() -> Bool {
guard let delegate = delegate else { guard let delegate = delegate else {return false}
return false selectedCandidateIndex = (selectedCandidateIndex + 1 >= delegate.candidateCountForController(self)) ? 0 : selectedCandidateIndex + 1
}
let currentIndex = selectedCandidateIndex
if currentIndex + 1 >= delegate.candidateCountForController(self) {
return false
}
selectedCandidateIndex = currentIndex + 1
return true return true
} }
public override func highlightPreviousCandidate() -> Bool { public override func highlightPreviousCandidate() -> Bool {
guard delegate != nil else { guard let delegate = delegate else {return false}
return false selectedCandidateIndex = (selectedCandidateIndex == 0) ? delegate.candidateCountForController(self) - 1 : selectedCandidateIndex - 1
}
let currentIndex = selectedCandidateIndex
if currentIndex == 0 {
return false
}
selectedCandidateIndex = currentIndex - 1
return true return true
} }