Fix to call return key type slot instead of show IME

Change-Id: I720e5a9f59790973045cb2634162b12e26287b19

diff --git a/ism/extras/efl_wsc/isf_wsc_control_ui.cpp b/ism/extras/efl_wsc/isf_wsc_control_ui.cpp
index 32a032bf17e47027a44b47190148e110d51bfe32..e522c977c3361e44596546119f11fa6b1ee589bd 100644 (file)
--- a/ism/extras/efl_wsc/isf_wsc_control_ui.cpp
+++ b/ism/extras/efl_wsc/isf_wsc_control_ui.cpp
@@ -265,6 +265,12 @@ Ecore_IMF_Input_Panel_Lang isf_wsc_context_input_panel_language_get (WSCContextI
     return iseContext.language;
 }
 
+void isf_wsc_context_input_panel_return_key_type_set (WSCContextISF *ctx, Ecore_IMF_Input_Panel_Return_Key_Type return_key_type)
+{
+    LOGD ("ctx : %p, return key type : %d\n", ctx, return_key_type);
+    _isf_wsc_context_input_panel_return_key_type_set (_get_context_id (ctx), return_key_type);
+}
+
 void isf_wsc_context_input_panel_return_key_disabled_set (WSCContextISF *ctx, Eina_Bool disabled)
 {
    if (!IfInitContext)

diff --git a/ism/extras/efl_wsc/isf_wsc_control_ui.h b/ism/extras/efl_wsc/isf_wsc_control_ui.h
index 8720ee66203e68c1607847167aed618d41e08797..856c80be48282b2a007c87a8eea7b7d41cd6cefe 100644 (file)
--- a/ism/extras/efl_wsc/isf_wsc_control_ui.h
+++ b/ism/extras/efl_wsc/isf_wsc_control_ui.h
@@ -50,6 +50,7 @@ extern "C"
     void isf_wsc_context_input_panel_caps_mode_set (WSCContextISF *ctx, unsigned int mode);
     void isf_wsc_context_input_panel_caps_lock_mode_set (WSCContextISF *ctx, Eina_Bool mode);
     void isf_wsc_context_set_keyboard_mode (WSCContextISF *ctx, scim::TOOLBAR_MODE_T mode);
+    void isf_wsc_context_input_panel_return_key_type_set (WSCContextISF *ctx, Ecore_IMF_Input_Panel_Return_Key_Type return_key_type);
     void isf_wsc_context_input_panel_return_key_disabled_set (WSCContextISF *ctx, Eina_Bool disabled);
     void isf_wsc_context_input_panel_imdata_set (WSCContextISF *ctx, const void *imdata, int len);
 

diff --git a/ism/extras/efl_wsc/isf_wsc_efl.cpp b/ism/extras/efl_wsc/isf_wsc_efl.cpp
index 4e7102b5976e0709c0466f009677c88ad67cc658..0a7d86180078d84159f5eb4aa79750b15a83a9e7 100644 (file)
--- a/ism/extras/efl_wsc/isf_wsc_efl.cpp
+++ b/ism/extras/efl_wsc/isf_wsc_efl.cpp
@@ -209,7 +209,7 @@ _wsc_im_ctx_return_key_type(void *data, struct wl_input_method_context *im_ctx,
 
     if (wsc->return_key_type != return_key_type) {
         wsc->return_key_type = return_key_type;
-        isf_wsc_context_input_panel_show (wsc->wsc_ctx);
+        isf_wsc_context_input_panel_return_key_type_set (wsc->wsc_ctx, (Ecore_IMF_Input_Panel_Return_Key_Type)wsc->return_key_type);
     }
 }