From 76d7824a7c825efc2a96eca5e61c16a079ff1156 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 19 Jan 2016 13:46:29 -0500 Subject: [PATCH] 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 --- src/bin/e_comp_wl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index a464af9d3..35394c5ae 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -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)) ec->comp_data->shell.unmap(ec->comp_data->shell.surface); - else + else if (e_client_has_xwindow(ec)) { ec->visible = EINA_FALSE; 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)) ec->comp_data->shell.map(ec->comp_data->shell.surface); - else + else if (e_client_has_xwindow(ec)) { ec->visible = EINA_TRUE; 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)) ec->comp_data->shell.unmap(ec->comp_data->shell.surface); - else + else if (e_client_has_xwindow(ec)) { ec->visible = EINA_FALSE; 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)) ec->comp_data->shell.map(ec->comp_data->shell.surface); - else + else if (e_client_has_xwindow(ec)) { ec->visible = EINA_TRUE; ec->ignored = 0;