enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

efl-wl: only send keyboard enter and activation for mapped surfaces 

setting active for unmapped surfaces bypasses the expected path for
unsetting activate during surface unmap if the surface is destroyed
while active and unmapped

@fix
This commit is contained in:
Mike Blumenkrantz 2018-01-17 17:33:57 -05:00
parent f6d045ea8d
commit 02af7e8210
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/efl_wl/efl_wl.c
View File

@ -1249,12 +1249,16 @@ shell_surface_send_configure(Comp_Surface *cs)
{
Comp_Surface *ccs;
comp_seats_redo_enter(cs->c, cs);
/* apply activation to already-mapped surface */
if (cs->mapped)
{
comp_seats_redo_enter(cs->c, cs);
shell_surface_aspect_update(cs);
shell_surface_minmax_update(cs);
}
EINA_INLIST_FOREACH(cs->children, ccs)
if (ccs->shell.surface && ccs->role && ccs->shell.popup)
ccs->shell.activated = cs->shell.activated;
shell_surface_aspect_update(cs);
shell_surface_minmax_update(cs);
}
else
shell_surface_deactivate_recurse(cs);
@ -1422,6 +1426,13 @@ comp_surface_commit_state(Comp_Surface *cs, Comp_Buffer_State *state)
{
if (cs->role && (!cs->extracted))
evas_object_show(cs->obj);
/* apply activation to activated surface on map */
if (cs->role && cs->shell.surface && cs->shell.activated && (!cs->shell.popup))
{
comp_seats_redo_enter(cs->c, cs);
shell_surface_aspect_update(cs);
shell_surface_minmax_update(cs);
}
}
if (state->attach && state->buffer)