InputHandler // Show current candidate ID during inline rotation.
This commit is contained in:
parent
79a0fb33a0
commit
74d4cc5b8c
|
@ -715,12 +715,13 @@ extension InputHandler {
|
||||||
|
|
||||||
let currentPaired = (currentNode.keyArray, currentNode.value)
|
let currentPaired = (currentNode.keyArray, currentNode.value)
|
||||||
|
|
||||||
var currentIndex: Int {
|
// 改成一次性計算,省得每次讀取時都被重複計算。
|
||||||
|
let currentIndex: Int = {
|
||||||
var result = 0
|
var result = 0
|
||||||
for candidate in candidates {
|
theLoop: for candidate in candidates {
|
||||||
if !currentNode.isOverridden {
|
if !currentNode.isOverridden {
|
||||||
if candidates[0] == currentPaired { result = reverseOrder ? candidates.count - 1 : 1 }
|
if candidates[0] == currentPaired { result = reverseOrder ? candidates.count - 1 : 1 }
|
||||||
break
|
break theLoop
|
||||||
}
|
}
|
||||||
result =
|
result =
|
||||||
(candidate == currentPaired && reverseOrder)
|
(candidate == currentPaired && reverseOrder)
|
||||||
|
@ -728,13 +729,23 @@ extension InputHandler {
|
||||||
if candidate == currentPaired { break }
|
if candidate == currentPaired { break }
|
||||||
}
|
}
|
||||||
return (0..<candidates.count).contains(result) ? result : 0
|
return (0..<candidates.count).contains(result) ? result : 0
|
||||||
}
|
}()
|
||||||
|
|
||||||
consolidateNode(
|
consolidateNode(
|
||||||
candidate: candidates[currentIndex], respectCursorPushing: false,
|
candidate: candidates[currentIndex], respectCursorPushing: false,
|
||||||
preConsolidate: false, skipObservation: true
|
preConsolidate: false, skipObservation: true
|
||||||
)
|
)
|
||||||
delegate.switchState(generateStateOfInputting())
|
var newState = generateStateOfInputting()
|
||||||
|
newState.tooltip = (currentIndex + 1).description + " / " + candidates.count.description + " "
|
||||||
|
vCLog(newState.tooltip)
|
||||||
|
if #available(macOS 10.13, *) {
|
||||||
|
if delegate.state.isVerticalTyping, Bundle.main.preferredLocalizations[0] != "en" {
|
||||||
|
let locID = Bundle.main.preferredLocalizations[0]
|
||||||
|
newState.tooltip = (currentIndex + 1).i18n(loc: locID) + "・" + candidates.count.i18n(loc: locID) + ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newState.tooltipDuration = 0
|
||||||
|
delegate.switchState(newState)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue