discomfitor pushed a commit to branch enlightenment-0.19.

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

commit 7c868b5be1028d4301b608426ee738e282dd021e
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Apr 28 07:48:16 2015 +0900

    e_shelf - check visiblity with zone and desk FIRST not later
    
    es->cfg->desk_show_mode if false (default) implies a shelf is always
    visible - true, as it's sticky (visible on all desktops). but this
    didn't check zone. check zone first THEN this.
---
 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 c975b1a..e6eac8f 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -838,12 +838,12 @@ e_shelf_desk_visible(const E_Shelf *es, const E_Desk 
*desk)
           }
         return EINA_FALSE;
      }
-   if (!es->cfg->desk_show_mode) return EINA_TRUE;
    cf_es = es->cfg;
    if (!cf_es) return EINA_FALSE;
 
    zone = desk->zone;
    if (cf_es->zone != (int)zone->num) return EINA_FALSE;
+   if (!es->cfg->desk_show_mode) return EINA_TRUE;
 
    EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
      {

-- 


Reply via email to