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

Repo // isAssociatedPhrasesMode -> isAssociatedPhrasesState.

This commit is contained in:
ShikiSuen 2022-08-17 18:46:13 +08:00
parent 43609bd899
commit 8fd2f96163
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Modules/ControllerModules/ctlInputMethod_Delegates.swift
View File

@ -52,7 +52,7 @@ extension ctlInputMethod: KeyHandlerDelegate {
// MARK: - Candidate Controller Delegate
extension ctlInputMethod: ctlCandidateDelegate {
var isAssociatedPhrasesMode: Bool { state is InputState.AssociatedPhrases }
var isAssociatedPhrasesState: Bool { state is InputState.AssociatedPhrases }
/// 完成 handle() 函式本該完成的內容，但去掉了與 IMK 選字窗有關的判斷語句。
/// 這樣分開處理很有必要，不然 handle() 函式會陷入無限迴圈。

2
Source/Modules/UIModules/CandidateUI/ctlCandidate.swift
View File

@ -27,7 +27,7 @@ public class CandidateKeyLabel: NSObject {
}
public protocol ctlCandidateDelegate: AnyObject {
var isAssociatedPhrasesMode: Bool { get }
var isAssociatedPhrasesState: Bool { get }
func sharedEventHandler(_ event: NSEvent!) -> Bool
func candidateCountForController(_ controller: ctlCandidateProtocol) -> Int
func candidatesForController(_ controller: ctlCandidateProtocol) -> [(String, String)]

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

@ -310,7 +310,7 @@ public class ctlCandidateIMK: IMKCandidates, ctlCandidateProtocol {
}
}
if delegate.isAssociatedPhrasesMode,
if delegate.isAssociatedPhrasesState,
!input.isPageUp, !input.isPageDown, !input.isCursorForward, !input.isCursorBackward,
!input.isCursorClockLeft, !input.isCursorClockRight, !input.isSpace,
!input.isEnter || !mgrPrefs.alsoConfirmAssociatedCandidatesByEnter