diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-17 17:33:57 -0500 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-01-17 16:42:31 -0500 |
commit | f6d045ea8db84e33e614eb159bde70d09f45b684 (patch) | |
tree | 6063e6ce2e8a70dfad99ce88e83ffebe279db1e5 /src/lib/efl_wl/efl_wl.c | |
parent | 11a9ed301dee2d4af9609465ade7685136ad49cc (diff) |
efl-wl: remove some broken logic for activating toplevel parents
parents of parents should not be marked as activated...probably
@fix
Diffstat (limited to '')
-rw-r--r-- | src/lib/efl_wl/efl_wl.c | 12 |
1 files 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 | |||
1147 | shell_surface_activate_recurse(Comp_Surface *cs) | 1147 | shell_surface_activate_recurse(Comp_Surface *cs) |
1148 | { | 1148 | { |
1149 | Comp_Surface *lcs, *parent = cs->parent; | 1149 | Comp_Surface *lcs, *parent = cs->parent; |
1150 | Eina_List *l, *parents = NULL; | 1150 | Eina_List *parents = NULL; |
1151 | Eina_Inlist *i; | 1151 | Eina_Inlist *i; |
1152 | 1152 | ||
1153 | if (parent) | 1153 | if (parent) |
1154 | { | 1154 | { |
1155 | /* apply focus to toplevel in case where focus is reverted */ | 1155 | /* remove focus from parents */ |
1156 | while (parent) | 1156 | while (parent) |
1157 | { | 1157 | { |
1158 | parents = eina_list_append(parents, parent); | 1158 | parents = eina_list_append(parents, parent); |
@@ -1170,14 +1170,6 @@ shell_surface_activate_recurse(Comp_Surface *cs) | |||
1170 | cs->c->surfaces = eina_inlist_promote(cs->c->surfaces, EINA_INLIST_GET(lcs)); | 1170 | cs->c->surfaces = eina_inlist_promote(cs->c->surfaces, EINA_INLIST_GET(lcs)); |
1171 | } | 1171 | } |
1172 | } | 1172 | } |
1173 | /* last item is the toplevel */ | ||
1174 | EINA_LIST_REVERSE_FOREACH(parents, l, lcs) | ||
1175 | { | ||
1176 | if (lcs->shell.activated) continue; | ||
1177 | lcs->shell.activated = 1; | ||
1178 | if (!lcs->shell.popup) | ||
1179 | shell_surface_send_configure(lcs); | ||
1180 | } | ||
1181 | eina_list_free(parents); | 1173 | eina_list_free(parents); |
1182 | } | 1174 | } |
1183 | 1175 | ||