diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index 6c4c409..f5f4ae1 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -324,11 +324,16 @@ show_preedit_string(); update_preedit_string(m_preeditor->getText()); update_preedit_caret(m_preeditor->getPos()); - } else hide_preedit_string(); + } else { + hide_preedit_string(); + } if (mini_status) { update_aux_string(utf8_mbstowcs(m_preeditor->getModeName())); show_aux_string(); + } else { + hide_aux_string(); } + hide_lookup_table(); updateProperty(); } /*! @@ -454,8 +459,6 @@ m_preeditor->reset(); wnn.reset(); m_conversion = false; - hide_lookup_table(); - hide_aux_string(); updatePreEditor(); m_lookup = false; alp_count = 1; @@ -464,8 +467,6 @@ if (k_cancel.comp(key) || k_backspace.comp(key)) { wnn.reset(); m_conversion = false; - hide_lookup_table(); - hide_aux_string(); m_lookup = false; alp_count = 0; updatePreEditor(); @@ -545,11 +546,9 @@ m_preeditor->reset(); wnn.reset(); m_conversion = false; - hide_preedit_string(); - hide_lookup_table(); - hide_aux_string(); m_lookup = false; alp_count = 0; + updatePreEditor(); return(process_preedit_key_event(key)); } @@ -618,11 +617,9 @@ alp_count = 0; m_conversion = false; m_lookup = false; - hide_lookup_table (); - hide_aux_string(); - hide_preedit_string (); wnn.reset(); m_preeditor->reset(); + updatePreEditor(); } void WnnInstance::focus_in () @@ -638,8 +635,6 @@ wnn.updateFrequency(); wnn.reset(); m_conversion = false; - hide_lookup_table(); - hide_aux_string(); m_lookup = false; alp_count = 0; } else if (m_preeditor->getTextLength()) {