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
This commit is contained in:
Mike Blumenkrantz 2015-11-09 13:20:50 -05:00
parent 9ffef78188
commit 945f9506cf
1 changed files with 7 additions and 4 deletions

View File

@ -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;
}