summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-20 16:58:24 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:35:15 -0500
commit65c222698cb9a8185314cd1f46f542c9c00a4c85 (patch)
tree0c0294ac84a68efbb59440cfa48b89deaf05a2c3
parent8ddc98d3a7865b66957bb0c74924b1eb1e0a942b (diff)
reenable fallthrough surface (un)mapping for subsurfaces during commit
subsurfaces have no shell interface and rely upon the map state of parent surfaces to determine whether they are mapped
-rw-r--r--src/bin/e_comp_wl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 12a072f08..de44dcefa 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1070,7 +1070,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1070 { 1070 {
1071 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap)) 1071 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
1072 ec->comp_data->shell.unmap(ec->comp_data->shell.surface); 1072 ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
1073 else if (ec->comp_data->cursor || e_client_has_xwindow(ec)) 1073 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
1074 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped))
1074 { 1075 {
1075 ec->visible = EINA_FALSE; 1076 ec->visible = EINA_FALSE;
1076 evas_object_hide(ec->frame); 1077 evas_object_hide(ec->frame);
@@ -1084,7 +1085,8 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state)
1084 { 1085 {
1085 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map)) 1086 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
1086 ec->comp_data->shell.map(ec->comp_data->shell.surface); 1087 ec->comp_data->shell.map(ec->comp_data->shell.surface);
1087 else if (ec->comp_data->cursor || e_client_has_xwindow(ec)) 1088 else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
1089 (ec->comp_data->sub.data && ec->comp_data->sub.data->parent->comp_data->mapped))
1088 { 1090 {
1089 ec->visible = EINA_TRUE; 1091 ec->visible = EINA_TRUE;
1090 ec->ignored = 0; 1092 ec->ignored = 0;