From 4307db6b3fc3d1e85a0dad3da703b224ffbc948c Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Tue, 9 Jun 2015 13:52:51 +0800 Subject: improves processEscape --- src/ZYZPhoneticEditor.cc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ZYZPhoneticEditor.cc b/src/ZYZPhoneticEditor.cc index d6ac31e..31d0200 100644 --- a/src/ZYZPhoneticEditor.cc +++ b/src/ZYZPhoneticEditor.cc @@ -109,8 +109,24 @@ PhoneticEditor::processEscape (guint keyval, guint keycode, if (cmshm_filter (modifiers) != 0) return TRUE; - reset (); - return TRUE; + if (STATE_INPUT == m_input_state) { + reset (); + update (); + return TRUE; + } + + if (STATE_CANDIDATE_SHOWN == m_input_state || + STATE_BUILTIN_SYMBOL_SHOWN == m_input_state || + STATE_BOPOMOFO_SYMBOL_SHOWN == m_input_state || + STATE_USER_SYMBOL_LIST_ALL == m_input_state || + STATE_USER_SYMBOL_SHOWN == m_input_state) { + + m_input_state = STATE_INPUT; + update (); + return TRUE; + } + + return FALSE; } -- cgit