[EGIT] [core/elementary] master 01/01: elm_conformant: display mode set fix

[Shilpa Singh]

hermet pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=66852fb942325d341ddf6e30f3162470ec27a539

commit 66852fb942325d341ddf6e30f3162470ec27a539
Author: Shilpa Singh <shilpa.si...@samsung.com>
Date:   Wed Sep 23 09:51:04 2015 +0900

    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 <shashan...@samsung.com>
    Signed-Off By: Shilpa Singh <shilpa.si...@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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index dd32aa4..12d3477 100644
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -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));
      }

--