[EGIT] [core/enlightenment] enlightenment-0.20 36/59: reenable fallthrough surface (un)mapping for subsurfaces during commit

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.20.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=65c222698cb9a8185314cd1f46f542c9c00a4c85

commit 65c222698cb9a8185314cd1f46f542c9c00a4c85
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Jan 20 16:58:24 2016 -0500

    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
---
 src/bin/e_comp_wl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 12a072f..de44dce 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)
           {
              if ((ec->comp_data->shell.surface) && 
(ec->comp_data->shell.unmap))
                ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
-             else if (ec->comp_data->cursor || e_client_has_xwindow(ec))
+             else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
+                      (ec->comp_data->sub.data && 
ec->comp_data->sub.data->parent->comp_data->mapped))
                {
                   ec->visible = EINA_FALSE;
                   evas_object_hide(ec->frame);
@@ -1084,7 +1085,8 @@ _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 if (ec->comp_data->cursor || e_client_has_xwindow(ec))
+             else if (ec->comp_data->cursor || e_client_has_xwindow(ec) ||
+                      (ec->comp_data->sub.data && 
ec->comp_data->sub.data->parent->comp_data->mapped))
                {
                   ec->visible = EINA_TRUE;
                   ec->ignored = 0;

--