fix bug hide event callback is delivered when canvas lost focus and IME is already...

Change-Id: Icc2280287abcf3134e01acd61a65fb9e4bed4f3d

diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.cpp b/ism/extras/efl_immodule/isf_imf_control_ui.cpp
index b03d4e147c02a494777a4d6375424dd2e8bcb2ad..5a77b71bb4786b1b35d26bda2def2e799c228850 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_control_ui.cpp
+++ b/ism/extras/efl_immodule/isf_imf_control_ui.cpp
@@ -213,8 +213,6 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value)
 
         if ((fn) && (fn->imf_context == using_ic) &&
             (fn->type == type) && (fn->func)) {
-            fn->func (fn->data, fn->imf_context, value);
-
             switch (type) {
                 case ECORE_IMF_INPUT_PANEL_STATE_EVENT:
                     switch (value) {
@@ -248,6 +246,8 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value)
                 default:
                     break;
             }
+
+            fn->func (fn->data, fn->imf_context, value);
         }
     }
 }
@@ -327,15 +327,15 @@ static void _input_panel_hide (Ecore_IMF_Context *ctx, Eina_Bool instant)
         _isf_imf_context_init ();
     }
 
-    if (input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-        hide_req_ic = ctx;
-    }
-
     if (instant) {
-        _clear_timer ();
-        _save_hide_context_info (ctx);
-        _send_input_panel_hide_request ();
+        if (input_panel_state != ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
+            hide_req_ic = ctx;
+            _clear_timer ();
+            _save_hide_context_info (ctx);
+            _send_input_panel_hide_request ();
+        }
     } else {
+        hide_req_ic = ctx;
         _input_panel_hide_timer_start (ctx);
     }
 }

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 5f019b5c24e69c493d6a839310b12642562c70f8..e138e12aeb6539a3e21f8f9dbf3b8502a78b74f5 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -4,7 +4,7 @@
 Name:       isf
 Summary:    Input Service Framework
 Version:    2.3.6128
-Release:    2
+Release:    3
 Group:      System Environment/Libraries
 License:    LGPL
 Source0:    %{name}-%{version}.tar.gz