summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-19 13:46:29 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:34:13 -0500
commit76d7824a7c825efc2a96eca5e61c16a079ff1156 (patch)
tree070e04adf70120fefe29244c4648ffa604d4f96d
parent7b4b823758c87438624cc685e038c4126d944996 (diff)
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
-rw-r--r--src/bin/e_comp_wl.c8
1 files 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)
1068 { 1068 {
1069 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) 1069 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
1070 ec->comp_data->shell.unmap(ec->comp_data->shell.surface); 1070 ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
1071 else 1071 else if (e_client_has_xwindow(ec))
1072 { 1072 {
1073 ec->visible = EINA_FALSE; 1073 ec->visible = EINA_FALSE;
1074 evas_object_hide(ec->frame); 1074 evas_object_hide(ec->frame);
@@ -1082,7 +1082,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1082 { 1082 {
1083 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) 1083 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
1084 ec->comp_data->shell.map(ec->comp_data->shell.surface); 1084 ec->comp_data->shell.map(ec->comp_data->shell.surface);
1085 else 1085 else if (e_client_has_xwindow(ec))
1086 { 1086 {
1087 ec->visible = EINA_TRUE; 1087 ec->visible = EINA_TRUE;
1088 ec->ignored = 0; 1088 ec->ignored = 0;
@@ -2756,7 +2756,7 @@ e_comp_wl_surface_commit(E_Client *ec)
2756 { 2756 {
2757 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) 2757 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
2758 ec->comp_data->shell.unmap(ec->comp_data->shell.surface); 2758 ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
2759 else 2759 else if (e_client_has_xwindow(ec))
2760 { 2760 {
2761 ec->visible = EINA_FALSE; 2761 ec->visible = EINA_FALSE;
2762 evas_object_hide(ec->frame); 2762 evas_object_hide(ec->frame);
@@ -2770,7 +2770,7 @@ e_comp_wl_surface_commit(E_Client *ec)
2770 { 2770 {
2771 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) 2771 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
2772 ec->comp_data->shell.map(ec->comp_data->shell.surface); 2772 ec->comp_data->shell.map(ec->comp_data->shell.surface);
2773 else 2773 else if (e_client_has_xwindow(ec))
2774 { 2774 {
2775 ec->visible = EINA_TRUE; 2775 ec->visible = EINA_TRUE;
2776 ec->ignored = 0; 2776 ec->ignored = 0;