From b7eba8af7b1c31d8718b19c5539746e2e4be8b54 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 17 Jan 2018 17:33:57 -0500 Subject: [PATCH] efl-wl: propagate surface activation back to parent if child is hidden a toplevel child will always be stacked right above its parent @fix --- src/lib/efl_wl/efl_wl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 6606e990e4..5f04eed930 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -2398,7 +2398,7 @@ comp_surface_smart_show(Evas_Object *obj) static void comp_surface_smart_hide(Evas_Object *obj) { - Comp_Surface *lcs, *cs = evas_object_smart_data_get(obj); + Comp_Surface *pcs = NULL, *lcs, *cs = evas_object_smart_data_get(obj); evas_object_hide(cs->clip); cs->mapped = 0; @@ -2426,9 +2426,11 @@ comp_surface_smart_hide(Evas_Object *obj) shell_surface_send_configure(lcs); return; } + if (!cs->parent->shell.popup) + pcs = cs->parent; } if (cs->c->seats) - comp_seats_redo_enter(cs->c, NULL); + comp_seats_redo_enter(cs->c, pcs); } static void