From cc76ac9cadb8661c99517b435bc66df98857cbd8 Mon Sep 17 00:00:00 2001 From: Sungmin Kwak Date: Tue, 18 Jun 2019 18:13:54 +0900 Subject: [PATCH] Fix a problem that ENTRY_METADATA event is not called Remove input_panel_shown flag; it can be a false by isf_control_hide_ime API Change-Id: I5a14eb45034f03d61edc09e8940bd023788bae98 --- ism/modules/panelagent/wayland/isf_wsc_context.h | 2 -- ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ism/modules/panelagent/wayland/isf_wsc_context.h b/ism/modules/panelagent/wayland/isf_wsc_context.h index 04df1d3..0c270e0 100644 --- a/ism/modules/panelagent/wayland/isf_wsc_context.h +++ b/ism/modules/panelagent/wayland/isf_wsc_context.h @@ -113,7 +113,6 @@ struct _WSCContextISF { Eina_Bool language_initialized; Eina_Bool return_key_disabled; - Eina_Bool input_panel_shown; WSCContextISFImpl *impl; @@ -142,7 +141,6 @@ struct _WSCContextISF { autocapital_type_initialized(EINA_FALSE), language_initialized(EINA_FALSE), return_key_disabled(EINA_FALSE), - input_panel_shown(EINA_FALSE), impl(NULL), id(0), next(NULL) diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index a7b03dc..d60ef6d 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -886,7 +886,6 @@ _wsc_im_show_input_panel (void *data, struct wl_input_method *input_method, stru if (!wsc || !wsc->wsc_ctx) return; isf_wsc_context_input_panel_show (wsc->wsc_ctx); - wsc->wsc_ctx->input_panel_shown = true; if (_TV) remote_surrounding_get (wsc->wsc_ctx); @@ -899,7 +898,6 @@ _wsc_im_hide_input_panel (void *data, struct wl_input_method *input_method, stru if (!wsc || !wsc->wsc_ctx) return; isf_wsc_context_input_panel_hide (wsc->wsc_ctx); - wsc->wsc_ctx->input_panel_shown = false; } static const struct wl_input_method_listener wsc_im_listener = { @@ -1566,7 +1564,7 @@ isf_wsc_context_send_surrounding_text (WSCContextISF* wsc_ctx, const char *text, context_scim->impl->cursor_pos = cursor; if (_TV) { - if (context_scim->input_panel_shown && context_scim->impl->input_resource != INPUT_RESOURCE_REMOTE) { + if (context_scim->impl->input_resource != INPUT_RESOURCE_REMOTE) { String _text(text); if (context_scim->impl->panel_layout == ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD) { const unsigned char pw_char[5] = { 0xE2, 0x80, 0xA2, 0x2A, 0x00 }; // • U+2022 * U+002A -- 2.7.4