diff --git a/Source/Modules/ControllerModules/InputSignal.swift b/Source/Modules/ControllerModules/InputSignal.swift index f20951ec..d53866bd 100644 --- a/Source/Modules/ControllerModules/InputSignal.swift +++ b/Source/Modules/ControllerModules/InputSignal.swift @@ -296,7 +296,7 @@ struct InputSignal: CustomStringConvertible { KeyCode(rawValue: keyCode) == KeyCode.kBackSpace } - var isESC: Bool { + var isEsc: Bool { KeyCode(rawValue: keyCode) == KeyCode.kEscape } diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift index c42ec121..0e78df2a 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleCandidate.swift @@ -55,7 +55,7 @@ extension KeyHandler { // MARK: 取消選字 (Cancel Candidate) let cancelCandidateKey = - input.isBackSpace || input.isESC || input.isDelete + input.isBackSpace || input.isEsc || input.isDelete || ((input.isCursorBackward || input.isCursorForward) && input.isShiftHold) if cancelCandidateKey { diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift index bfb9d319..857fe3b8 100644 --- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift +++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift @@ -303,7 +303,7 @@ extension KeyHandler { // MARK: Esc - if input.isESC { return handleEsc(state: state, stateCallback: stateCallback, errorCallback: errorCallback) } + if input.isEsc { return handleEsc(state: state, stateCallback: stateCallback, errorCallback: errorCallback) } // MARK: Tab diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift index fc900bcb..5fe6f2bf 100644 --- a/Source/Modules/ControllerModules/KeyHandler_States.swift +++ b/Source/Modules/ControllerModules/KeyHandler_States.swift @@ -212,7 +212,7 @@ extension KeyHandler { stateCallback: @escaping (InputStateProtocol) -> Void, errorCallback: @escaping () -> Void ) -> Bool { - if input.isESC { + if input.isEsc { stateCallback(buildInputtingState) return true }