enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

temporarily toggle ignored flag during wl surface commit 

ensures canvas operations succeed during commit in cases where
subsequent commits do not occur (eg. menus, popups, ...)
This commit is contained in:
Mike Blumenkrantz 2015-06-30 18:34:16 -04:00
parent 8644c88b39
commit 52fd0581fa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/e_comp_wl.c
View File

@ -1091,10 +1091,11 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
{ {
Eina_Bool first = EINA_FALSE; Eina_Bool first = EINA_FALSE;
Eina_Rectangle *dmg; Eina_Rectangle *dmg;
Eina_Bool placed = EINA_TRUE; Eina_Bool ignored, placed = EINA_TRUE;
int x = 0, y = 0; int x = 0, y = 0;
first = !e_pixmap_usable_get(ec->pixmap); first = !e_pixmap_usable_get(ec->pixmap);
ignored = ec->ignored;
if (state->new_attach) if (state->new_attach)
e_comp_wl_surface_attach(ec, state->buffer); e_comp_wl_surface_attach(ec, state->buffer);
@ -1138,6 +1139,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
else else
{ {
ec->visible = EINA_TRUE; ec->visible = EINA_TRUE;
ec->ignored = 0;
evas_object_show(ec->frame); evas_object_show(ec->frame);
ec->comp_data->mapped = evas_object_visible_get(ec->frame); ec->comp_data->mapped = evas_object_visible_get(ec->frame);
} }
@ -1165,6 +1167,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
state->sy = 0; state->sy = 0;
state->new_attach = EINA_FALSE; state->new_attach = EINA_FALSE;
ec->ignored = ignored;
if (!ec->comp_data->mapped) goto unmapped; if (!ec->comp_data->mapped) goto unmapped;
/* put state damages into surface */ /* put state damages into surface */
@ -2704,8 +2707,11 @@ e_comp_wl_surface_attach(E_Client *ec, E_Comp_Wl_Buffer *buffer)
EINTERN Eina_Bool EINTERN Eina_Bool
e_comp_wl_surface_commit(E_Client *ec) e_comp_wl_surface_commit(E_Client *ec)
{ {
Eina_Bool ignored;
_e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending); _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending);
ignored = ec->ignored;
/* schedule repaint */ /* schedule repaint */
if (e_pixmap_refresh(ec->pixmap)) if (e_pixmap_refresh(ec->pixmap))
{ {
@ -2736,11 +2742,13 @@ e_comp_wl_surface_commit(E_Client *ec)
else else
{ {
ec->visible = EINA_TRUE; ec->visible = EINA_TRUE;
ec->ignored = 0;
evas_object_show(ec->frame); evas_object_show(ec->frame);
ec->comp_data->mapped = evas_object_visible_get(ec->frame); ec->comp_data->mapped = evas_object_visible_get(ec->frame);
} }
} }
} }
ec->ignored = ignored;
return EINA_TRUE; return EINA_TRUE;
} }