diff --git a/Source/Modules/ControllerModules/ctlInputMethod_Delegates.swift b/Source/Modules/ControllerModules/ctlInputMethod_Delegates.swift index e0ff5a2d..d265234f 100644 --- a/Source/Modules/ControllerModules/ctlInputMethod_Delegates.swift +++ b/Source/Modules/ControllerModules/ctlInputMethod_Delegates.swift @@ -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() 函式會陷入無限迴圈。 diff --git a/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift b/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift index f13943e4..8d859201 100644 --- a/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift +++ b/Source/Modules/UIModules/CandidateUI/ctlCandidate.swift @@ -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)] diff --git a/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift b/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift index 3f7f96d1..1dce3f95 100644 --- a/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift +++ b/Source/Modules/UIModules/CandidateUI/ctlCandidateIMK.swift @@ -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