From 2367e91840bd5396b4c2e3a4c74f8d74ee42546e Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Thu, 30 Jun 2022 23:20:31 +0800 Subject: [PATCH] KeyHandler // Use compositor.isEmpty in handleEsc(). --- .../Modules/ControllerModules/KeyHandler_States.swift | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift index 5fe6f2bf..c85cc886 100644 --- a/Source/Modules/ControllerModules/KeyHandler_States.swift +++ b/Source/Modules/ControllerModules/KeyHandler_States.swift @@ -605,15 +605,10 @@ extension KeyHandler { clear() stateCallback(InputState.EmptyIgnoringPreviousState()) } else { + if composer.isEmpty { return true } /// 如果注拼槽不是空的話,則清空之。 - if !composer.isEmpty { - composer.clear() - if compositorLength == 0 { - stateCallback(InputState.EmptyIgnoringPreviousState()) - } else { - stateCallback(buildInputtingState) - } - } + composer.clear() + stateCallback(compositor.isEmpty ? InputState.EmptyIgnoringPreviousState() : buildInputtingState) } return true }