[EGIT] [core/enlightenment] master 02/02: enforce fullscreen client stacking during nocomp end IFF client is fullscreen

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=945f9506cf7377bf01de3a6a87a669be0f290fb3

commit 945f9506cf7377bf01de3a6a87a669be0f290fb3
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Nov 9 13:20:50 2015 -0500

    enforce fullscreen client stacking during nocomp end IFF client is 
fullscreen
    
    previous behavior would result in the nocomp window becoming stuck at a 
fullscreen
    layer when ending nocomp, even if the client was no longer fullscreen
    
    fix T2827
---
 src/bin/e_comp.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 655186c..ce2d1e5 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -357,12 +357,15 @@ _e_comp_nocomp_end(void)
         E_Layer layer = MAX(e_comp->nocomp_ec->saved.layer, 
E_LAYER_CLIENT_NORMAL);
         Eina_Bool fs;
 
-        if (!e_config->allow_above_fullscreen)
-          layer = E_LAYER_CLIENT_FULLSCREEN;
-        else if (e_config->mode.presentation)
-          layer = E_LAYER_CLIENT_TOP;
         fs = e_comp->nocomp_ec->fullscreen;
         e_comp->nocomp_ec->fullscreen = 0;
+        if (fs)
+          {
+             if (!e_config->allow_above_fullscreen)
+               layer = E_LAYER_CLIENT_FULLSCREEN;
+             else if (e_config->mode.presentation)
+               layer = E_LAYER_CLIENT_TOP;
+          }
         evas_object_layer_set(e_comp->nocomp_ec->frame, layer);
         e_comp->nocomp_ec->fullscreen = fs;
      }

--