[EGIT] [core/enlightenment] enlightenment-0.20 25/34: enforce border_fix_on_shelf_toggle config option in shelf

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.20.

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

commit b8a5f960b9fa6bfb21edb9a1449375fd01a097b5
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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index b955b18..3198b83 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -91,7 +91,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;

--