styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only do passthrough surface map on xwayland surfaces during commit 

these was a workaround for handling early internal windows which is
no longer necessary now that they will handle their map states more
effectively

now, any wayland surface (not xwayland) requires a shell to map the
surface as intended
This commit is contained in:
Mike Blumenkrantz 2016-01-19 13:46:29 -05:00
parent 0df8c94572
commit 0a2442d3b7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_comp_wl.c
View File

@ -1068,7 +1068,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
{ {
if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
ec->comp_data->shell.unmap(ec->comp_data->shell.surface); ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
else else if (e_client_has_xwindow(ec))
{ {
ec->visible = EINA_FALSE; ec->visible = EINA_FALSE;
evas_object_hide(ec->frame); evas_object_hide(ec->frame);
@ -1082,7 +1082,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
{ {
if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
ec->comp_data->shell.map(ec->comp_data->shell.surface); ec->comp_data->shell.map(ec->comp_data->shell.surface);
else else if (e_client_has_xwindow(ec))
{ {
ec->visible = EINA_TRUE; ec->visible = EINA_TRUE;
ec->ignored = 0; ec->ignored = 0;
@ -2756,7 +2756,7 @@ e_comp_wl_surface_commit(E_Client *ec)
{ {
if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
ec->comp_data->shell.unmap(ec->comp_data->shell.surface); ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
else else if (e_client_has_xwindow(ec))
{ {
ec->visible = EINA_FALSE; ec->visible = EINA_FALSE;
evas_object_hide(ec->frame); evas_object_hide(ec->frame);
@ -2770,7 +2770,7 @@ e_comp_wl_surface_commit(E_Client *ec)
{ {
if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
ec->comp_data->shell.map(ec->comp_data->shell.surface); ec->comp_data->shell.map(ec->comp_data->shell.surface);
else else if (e_client_has_xwindow(ec))
{ {
ec->visible = EINA_TRUE; ec->visible = EINA_TRUE;
ec->ignored = 0; ec->ignored = 0;