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 13:20:50 -0500
commit945f9506cf7377bf01de3a6a87a669be0f290fb3 (patch)
tree1c7c0483a0afc5fc9c1061d9b5be58acdf779231
parent9ffef78188b523a3de594a1e99f8f8973ce872fe (diff)
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.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 655186c8f..ce2d1e577 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -357,12 +357,15 @@ _e_comp_nocomp_end(void)
357 E_Layer layer = MAX(e_comp->nocomp_ec->saved.layer, E_LAYER_CLIENT_NORMAL); 357 E_Layer layer = MAX(e_comp->nocomp_ec->saved.layer, E_LAYER_CLIENT_NORMAL);
358 Eina_Bool fs; 358 Eina_Bool fs;
359 359
360 if (!e_config->allow_above_fullscreen)
361 layer = E_LAYER_CLIENT_FULLSCREEN;
362 else if (e_config->mode.presentation)
363 layer = E_LAYER_CLIENT_TOP;
364 fs = e_comp->nocomp_ec->fullscreen; 360 fs = e_comp->nocomp_ec->fullscreen;
365 e_comp->nocomp_ec->fullscreen = 0; 361 e_comp->nocomp_ec->fullscreen = 0;
362 if (fs)
363 {
364 if (!e_config->allow_above_fullscreen)
365 layer = E_LAYER_CLIENT_FULLSCREEN;
366 else if (e_config->mode.presentation)
367 layer = E_LAYER_CLIENT_TOP;
368 }
366 evas_object_layer_set(e_comp->nocomp_ec->frame, layer); 369 evas_object_layer_set(e_comp->nocomp_ec->frame, layer);
367 e_comp->nocomp_ec->fullscreen = fs; 370 e_comp->nocomp_ec->fullscreen = fs;
368 } 371 }