[EGIT] [core/enlightenment] master 02/04: enforce border_fix_on_shelf_toggle config option in shelf

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=5d63b07ca39011f4f1508c68f2d361d28584422e

commit 5d63b07ca39011f4f1508c68f2d361d28584422e
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jan 14 15:53:36 2016 -0500

    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
---
 src/bin/e_shelf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 31b1337..f6acd95 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -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;

--