Fix bug preedit is not committed when changing keyboard mode

Change-Id: I0dc380da2e2f56b4604b23cf85ff2810a9e68c80
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/im_engine.h b/src/im_engine.h
index 664ecb5..d1934f7 100644 (file)
--- a/src/im_engine.h
+++ b/src/im_engine.h
@@ -65,12 +65,14 @@ public:
     ~UnikeyInstancePreedit();
 
     virtual void reset();
+    virtual void flush();
     virtual void focus_in();
     virtual void focus_out();
     virtual bool process_key_event(const KeyEvent& key);
     virtual void trigger_property(const String &property);
 
 private:
+    void flush_preedit(bool commit);
     bool unikey_process_key_event(const KeyEvent& key);
     void unikey_update_preedit_string(const WideString s, const bool visible);
     PropertyList CreatePropertyList();

diff --git a/src/unikey_instance.cpp b/src/unikey_instance.cpp
index 69e3fcc..57ba634 100644 (file)
--- a/src/unikey_instance.cpp
+++ b/src/unikey_instance.cpp
@@ -394,22 +394,34 @@ void UnikeyInstancePreedit::focus_in()
 
 void UnikeyInstancePreedit::focus_out()
 {
-    reset();
+    flush();
 }
 
-void UnikeyInstancePreedit::reset()
+void UnikeyInstancePreedit::flush_preedit(bool commit)
 {
     UnikeyInstance::reset();
 
     if (m_preeditstring.length())
     {
-        commit_string(m_preeditstring);
+        if (commit)
+            commit_string(m_preeditstring);
+
         hide_preedit_string();
         m_preeditstring.clear();
     }
     m_auto_commit = false;
 }
 
+void UnikeyInstancePreedit::reset()
+{
+    flush_preedit(false);
+}
+
+void UnikeyInstancePreedit::flush()
+{
+    flush_preedit(true);
+}
+
 void UnikeyInstancePreedit::unikey_update_preedit_string(const WideString s, const bool visible)
 {
     AttributeList attlist;