[EGIT] [core/enlightenment] master 01/01: improve enforcement of shelf autohide-related window adjustment

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

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

commit c14adb768f25690d6d5f9f9e29a56a0bb344d161
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed Feb 17 11:36:30 2016 -0500

    improve enforcement of shelf autohide-related window adjustment
    
    for whatever reason, there's a global option which makes windows adjust
    when a shelf autohides as well as a per-shelf option to ignore the global
    option
    
    in the case where the global option is not enabled, there is no reason to
    check the per-shelf option
    
    ref 5d63b07ca39011f4f1508c68f2d361d28584422e
---
 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 90bc0f4..6a0d135 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -122,7 +122,7 @@ _e_shelf_remaximize(E_Shelf *es)
 {
    E_Client *ec;
 
-   if (es->cfg->overlap && e_config->border_fix_on_shelf_toggle) return;
+   if ((!e_config->border_fix_on_shelf_toggle) || es->cfg->overlap) return;
    E_CLIENT_FOREACH(ec)
      {
         E_Maximize max = ec->maximized;

--