diff options
| author | Shilpa Singh <shilpa.singh@samsung.com> | 2015-09-23 09:51:04 +0900 |
|---|---|---|
| committer | ChunEon Park <hermet@hermet.pe.kr> | 2015-09-23 09:52:23 +0900 |
| commit | 44c3baaee1103ca309248b89874222a075017886 (patch) | |
| tree | 30960fdb4210beeafe4fb3bd8887611f7f397083 | |
| parent | f281b3f1f748bd854a732e399668e5a8739f20b2 (diff) | |
| download | elementary-44c3baaee1103ca309248b89874222a075017886.tar.gz | |
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.c | 6 |
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) evas_object_size_hint_min_set(sd->virtualkeypad, -1, 0); evas_object_size_hint_max_set(sd->virtualkeypad, -1, 0); _conformant_part_sizing_eval(obj, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART); - elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); + if (!sd->clipboard_state) + elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); eo_do(obj, eo_event_callback_call( ELM_CONFORMANT_EVENT_VIRTUALKEYPAD_STATE_OFF, NULL)); } @@ -801,7 +802,8 @@ _clipboard_state_change(Evas_Object *obj, Ecore_X_Event_Window_Property *ev) { evas_object_size_hint_min_set(sd->clipboard, -1, 0); evas_object_size_hint_max_set(sd->clipboard, -1, 0); - elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); + if (!sd->vkb_state) + elm_widget_display_mode_set(obj, EVAS_DISPLAY_MODE_NONE); eo_do(obj, eo_event_callback_call( ELM_CONFORMANT_EVENT_CLIPBOARD_STATE_OFF, NULL)); } |