From f6d045ea8db84e33e614eb159bde70d09f45b684 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 17 Jan 2018 17:33:57 -0500 Subject: [PATCH] efl-wl: remove some broken logic for activating toplevel parents parents of parents should not be marked as activated...probably @fix --- src/lib/efl_wl/efl_wl.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 88a9600b21..736203938f 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -1147,12 +1147,12 @@ static void shell_surface_activate_recurse(Comp_Surface *cs) { Comp_Surface *lcs, *parent = cs->parent; - Eina_List *l, *parents = NULL; + Eina_List *parents = NULL; Eina_Inlist *i; if (parent) { - /* apply focus to toplevel in case where focus is reverted */ + /* remove focus from parents */ while (parent) { parents = eina_list_append(parents, parent); @@ -1170,14 +1170,6 @@ shell_surface_activate_recurse(Comp_Surface *cs) cs->c->surfaces = eina_inlist_promote(cs->c->surfaces, EINA_INLIST_GET(lcs)); } } - /* last item is the toplevel */ - EINA_LIST_REVERSE_FOREACH(parents, l, lcs) - { - if (lcs->shell.activated) continue; - lcs->shell.activated = 1; - if (!lcs->shell.popup) - shell_surface_send_configure(lcs); - } eina_list_free(parents); }