summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShilpa Singh <shilpa.singh@samsung.com>2015-09-23 09:51:04 +0900
committerChunEon Park <hermet@hermet.pe.kr>2015-09-23 09:52:23 +0900
commit44c3baaee1103ca309248b89874222a075017886 (patch)
tree30960fdb4210beeafe4fb3bd8887611f7f397083
parentf281b3f1f748bd854a732e399668e5a8739f20b2 (diff)
elm_conformant: display mode set fix
Summary: Set the display mode to none only when both clipboard and keypad is hidden. Signed-Off By: Shashank Pandey <shashank.p@samsung.com> Signed-Off By: Shilpa Singh <shilpa.singh@samsung.com> @fix Test Plan: Keypad opened, Clipboard opened, close clipboard Reviewers: woohyun, CHAN, Hermet Reviewed By: Hermet Subscribers: CHAN, Jaehyun, shashank0990 Differential Revision: https://phab.enlightenment.org/D2968
-rw-r--r--src/lib/elm_conform.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 543aa7d90..9143b47bb 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -762,7 +762,8 @@ _virtualkeypad_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
762 evas_object_size_hint_min_set(sd->virtualkeypad, -1, 0); 762 evas_object_size_hint_min_set(sd->virtualkeypad, -1, 0);
763 evas_object_size_hint_max_set(sd->virtualkeypad, -1, 0); 763 evas_object_size_hint_max_set(sd->virtualkeypad, -1, 0);
764 _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART); 764 _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
765 elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); 765 if (!sd->clipboard_state)
766 elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
766 eo_do(obj, eo_event_callback_call( 767 eo_do(obj, eo_event_callback_call(
767 ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL)); 768 ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL));
768 } 769 }
@@ -801,7 +802,8 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev)
801 { 802 {
802 evas_object_size_hint_min_set(sd->clipboard, -1, 0); 803 evas_object_size_hint_min_set(sd->clipboard, -1, 0);
803 evas_object_size_hint_max_set(sd->clipboard, -1, 0); 804 evas_object_size_hint_max_set(sd->clipboard, -1, 0);
804 elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); 805 if (!sd->vkb_state)
806 elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE);
805 eo_do(obj, eo_event_callback_call( 807 eo_do(obj, eo_event_callback_call(
806 ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL)); 808 ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL));
807 } 809 }