enforce border_fix_on_shelf_toggle config option in shelf

shelf overlap can only take effect based on the state of this option:
specifically, overlap can only be enabled if border_fix_on_shelf_toggle
is enabled
This commit is contained in:
Mike Blumenkrantz 2016-01-14 15:53:36 -05:00
parent 5ec690512d
commit 5d63b07ca3
1 changed files with 2 additions and 2 deletions

View File

@ -89,7 +89,7 @@ _e_shelf_remaximize(E_Shelf *es)
{
E_Client *ec;
if (es->cfg->overlap) return;
if (es->cfg->overlap && e_config->border_fix_on_shelf_toggle) return;
E_CLIENT_FOREACH(ec)
{
E_Maximize max = ec->maximized;
@ -973,7 +973,7 @@ E_API void
e_shelf_obstacles_update(E_Shelf *es)
{
E_FREE_LIST(es->zone_obstacles, e_object_del);
if (es->cfg->overlap || es->cfg->autohide) return;
if ((es->cfg->overlap && e_config->border_fix_on_shelf_toggle) || es->cfg->autohide) return;
if (es->cfg->desk_show_mode)
{
Eina_List *l;