discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=84ae9d82d07cb55ab76e6f880f1c6f206f076594

commit 84ae9d82d07cb55ab76e6f880f1c6f206f076594
Author: Mike Blumenkrantz <[email protected]>
Date:   Fri Jul 28 15:44:43 2017 -0400

    efl-wl: hide popup surface before unsetting attrs during destructor
    
    ensure focus remains with the popup parent
---
 src/lib/efl_wl/efl_wl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c
index a18039ff21..808daccb9b 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);
 }

-- 


Reply via email to