Separated input_method_destroy from input_method_deactivate 33/221833/1
authorInHong Han <inhong1.han@samsung.com>
Wed, 8 Jan 2020 01:37:56 +0000 (10:37 +0900)
committerInHong Han <inhong1.han@samsung.com>
Wed, 8 Jan 2020 01:37:56 +0000 (10:37 +0900)
Change-Id: Ifd5e4fbd6fa0c78b2cddf4a1740335b31908c480

ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp

index dfbf0a1..7869536 100644 (file)
@@ -871,9 +871,12 @@ _wsc_im_deactivate (void *data, struct wl_input_method *input_method, struct wl_
         _wl_im_ctx->need_focus_event = EINA_FALSE;
     }
     wsc->wsc_ctx->input_panel_shown_once = EINA_FALSE;
+}
 
-    if (_launch_ise_on_request)
-        wl_im_destroy ();
+static void
+_wsc_im_destroy (void *data, struct wl_input_method *input_method, struct wl_input_method_context *im_ctx)
+{
+    wl_im_destroy ();
 }
 
 static void
@@ -901,6 +904,7 @@ _wsc_im_hide_input_panel (void *data, struct wl_input_method *input_method, stru
 static const struct wl_input_method_listener wsc_im_listener = {
     _wsc_im_activate,
     _wsc_im_deactivate,
+    _wsc_im_destroy,
     _wsc_im_show_input_panel,
     _wsc_im_hide_input_panel
 };