From 0e4b25747f8b86e2a923d078c6124fbeb9590c11 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 15 Nov 2013 08:44:19 +0000 Subject: [PATCH] Don't call input panel show/hide methods unless input_panel_enabled is true. Fixes Phab Ticket T501 Signed-off-by: Chris Michael --- src/modules/ecore_imf/wayland/wayland_imcontext.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c index 7a418f3..6e301c9 100644 --- a/src/modules/ecore_imf/wayland/wayland_imcontext.c +++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c @@ -635,7 +635,8 @@ wayland_im_context_focus_in(Ecore_IMF_Context *ctx) imcontext->input = input; - if (imcontext->text_input) + if ((imcontext->text_input) && + (ecore_imf_context_input_panel_enabled_get(ctx))) { wl_text_input_show_input_panel(imcontext->text_input); wl_text_input_activate(imcontext->text_input, seat, @@ -759,7 +760,8 @@ wayland_im_context_show(Ecore_IMF_Context *ctx) EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show"); - if (imcontext->text_input) + if ((imcontext->text_input) && + (ecore_imf_context_input_panel_enabled_get(ctx))) wl_text_input_show_input_panel(imcontext->text_input); } @@ -770,7 +772,8 @@ wayland_im_context_hide(Ecore_IMF_Context *ctx) EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_hide"); - if (imcontext->text_input) + if ((imcontext->text_input) && + (ecore_imf_context_input_panel_enabled_get(ctx))) wl_text_input_hide_input_panel(imcontext->text_input); } -- 2.7.4