summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-11-09 13:20:50 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-11-09 14:34:09 -0500
commit245bb979221cb0dca3252b103b3cb274ddd3d916 (patch)
tree97cc31fa06d9911ead87df9bda6e49bd48867dbd
parenteefba0945669f8829c34d43642c05f84eca7a82b (diff)
downloadenlightenment-245bb979221cb0dca3252b103b3cb274ddd3d916.tar.gz
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
-rw-r--r--src/bin/e_comp.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 09e9280094..7cf9f2bddf 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -364,6 +364,13 @@ _e_comp_nocomp_end(E_Comp *c)
layer = E_LAYER_CLIENT_TOP;
fs = c->nocomp_ec->fullscreen;
c->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(c->nocomp_ec->frame, layer);
c->nocomp_ec->fullscreen = fs;
}