summaryrefslogtreecommitdiff
path: root/src/lib/efl_wl/efl_wl.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-07-28 15:44:43 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-07-28 15:40:47 -0400
commit84ae9d82d07cb55ab76e6f880f1c6f206f076594 (patch)
tree5743ecb825b900197934244b33b5f55302b803ba /src/lib/efl_wl/efl_wl.c
parente24bc7517b1c8c0a5d42eafd469807cb11f329f4 (diff)
efl-wl: hide popup surface before unsetting attrs during destructor
ensure focus remains with the popup parent
Diffstat (limited to '')
-rw-r--r--src/lib/efl_wl/efl_wl.c2
1 files changed, 1 insertions, 1 deletions
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)
3134 Comp_Seat *s; 3134 Comp_Seat *s;
3135 3135
3136 cs->role = NULL; 3136 cs->role = NULL;
3137 evas_object_hide(cs->obj);
3137 cs->shell.popup = 0; 3138 cs->shell.popup = 0;
3138 EINA_LIST_FREE(cs->shell.grabs, s) 3139 EINA_LIST_FREE(cs->shell.grabs, s)
3139 if (s->grab == cs) 3140 if (s->grab == cs)
@@ -3147,7 +3148,6 @@ shell_surface_popup_impl_destroy(struct wl_resource *resource)
3147 if (cs->children) 3148 if (cs->children)
3148 wl_resource_post_error(cs->shell.surface, ZXDG_SHELL_V6_ERROR_DEFUNCT_SURFACES, 3149 wl_resource_post_error(cs->shell.surface, ZXDG_SHELL_V6_ERROR_DEFUNCT_SURFACES,
3149 "popups dismissed out of order"); 3150 "popups dismissed out of order");
3150 evas_object_hide(cs->obj);
3151 if (cs->parent) 3151 if (cs->parent)
3152 comp_surface_reparent(cs, NULL); 3152 comp_surface_reparent(cs, NULL);
3153} 3153}