diff options
author | Chris Michael <cp.michael@samsung.com> | 2013-11-15 08:44:19 +0000 |
---|---|---|
committer | Chris Michael <cp.michael@samsung.com> | 2013-11-15 08:44:19 +0000 |
commit | 0e4b25747f8b86e2a923d078c6124fbeb9590c11 (patch) | |
tree | 5664effea5ce798aa56ddc8354adb83ee8321339 | |
parent | d00b7b2fe6a21dacb330da602e88a4b8941a38af (diff) |
Don't call input panel show/hide methods unless input_panel_enabled is
true.
Fixes Phab Ticket T501
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r-- | src/modules/ecore_imf/wayland/wayland_imcontext.c | 9 |
1 files 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 7a418f324f..6e301c930f 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) | |||
635 | 635 | ||
636 | imcontext->input = input; | 636 | imcontext->input = input; |
637 | 637 | ||
638 | if (imcontext->text_input) | 638 | if ((imcontext->text_input) && |
639 | (ecore_imf_context_input_panel_enabled_get(ctx))) | ||
639 | { | 640 | { |
640 | wl_text_input_show_input_panel(imcontext->text_input); | 641 | wl_text_input_show_input_panel(imcontext->text_input); |
641 | wl_text_input_activate(imcontext->text_input, seat, | 642 | wl_text_input_activate(imcontext->text_input, seat, |
@@ -759,7 +760,8 @@ wayland_im_context_show(Ecore_IMF_Context *ctx) | |||
759 | 760 | ||
760 | EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show"); | 761 | EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show"); |
761 | 762 | ||
762 | if (imcontext->text_input) | 763 | if ((imcontext->text_input) && |
764 | (ecore_imf_context_input_panel_enabled_get(ctx))) | ||
763 | wl_text_input_show_input_panel(imcontext->text_input); | 765 | wl_text_input_show_input_panel(imcontext->text_input); |
764 | } | 766 | } |
765 | 767 | ||
@@ -770,7 +772,8 @@ wayland_im_context_hide(Ecore_IMF_Context *ctx) | |||
770 | 772 | ||
771 | EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_hide"); | 773 | EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_hide"); |
772 | 774 | ||
773 | if (imcontext->text_input) | 775 | if ((imcontext->text_input) && |
776 | (ecore_imf_context_input_panel_enabled_get(ctx))) | ||
774 | wl_text_input_hide_input_panel(imcontext->text_input); | 777 | wl_text_input_hide_input_panel(imcontext->text_input); |
775 | } | 778 | } |
776 | 779 | ||