elm_conformant: display mode set fix
authorShilpa Singh <shilpa.singh@samsung.com>
Wed, 23 Sep 2015 00:51:04 +0000 (09:51 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Wed, 23 Sep 2015 00:51:04 +0000 (09:51 +0900)
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

src/lib/elm_conform.c

index dd32aa46927930abb0286c42980e3522cc768f0d..12d34777d972b9a6af37e95ea1f08f0fa9bc01ad 100644 (file)
@@ -766,7 +766,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));
      }
@@ -805,7 +806,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));
      }