From: Mike Blumenkrantz <zmike@osg.samsung.com>
Date: Fri, 28 Jul 2017 19:44:43 +0000 (-0400)
Subject: efl-wl: hide popup surface before unsetting attrs during destructor
X-Git-Tag: upstream/1.20.0~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84ae9d82d07cb55ab76e6f880f1c6f206f076594;p=platform%2Fupstream%2Fefl.git

efl-wl: hide popup surface before unsetting attrs during destructor

ensure focus remains with the popup parent
---

diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c
index a18039f..808dacc 100644
--- a/src/lib/efl_wl/efl_wl.c
+++ b/src/lib/efl_wl/efl_wl.c
@@ -3134,6 +3134,7 @@ shell_surface_popup_impl_destroy(struct wl_resource *resource)
    Comp_Seat *s;
 
    cs->role = NULL;
+   evas_object_hide(cs->obj);
    cs->shell.popup = 0;
    EINA_LIST_FREE(cs->shell.grabs, s)
      if (s->grab == cs)
@@ -3147,7 +3148,6 @@ shell_surface_popup_impl_destroy(struct wl_resource *resource)
    if (cs->children)
      wl_resource_post_error(cs->shell.surface, ZXDG_SHELL_V6_ERROR_DEFUNCT_SURFACES,
                             "popups dismissed out of order");
-   evas_object_hide(cs->obj);
    if (cs->parent)
      comp_surface_reparent(cs, NULL);
 }