discomfitor pushed a commit to branch master.

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

commit 11ec0ea86ba72d8c0ebd99d8fb72c01efe7e90c8
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Wed Jul 30 14:23:25 2014 -0400

    make nocomp-skipable objects not require shelf
---
 src/bin/e_comp.c  | 2 +-
 src/bin/e_shelf.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 63c1aa1..d884f6c 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -140,7 +140,7 @@ _e_comp_visible_object_is(Evas_Object *obj, Evas_Coord x, 
Evas_Coord y, Evas_Coo
                                            return 
_e_comp_visible_object_clip_is(o);
                                         }
                                       eina_list_free(children);
-                                      return !evas_object_data_get(o, 
"E_Shelf");
+                                      return !!evas_object_data_get(o, 
"comp_skip");
                                    }
                               }
                             eina_list_free(children);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 3f4f6a0..c975b1a 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -232,6 +232,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char 
*style, E_Layer laye
      type = E_COMP_OBJECT_TYPE_NONE;
    es->comp_object = e_comp_object_util_add(es->o_base, type);
    evas_object_data_set(es->comp_object, "E_Shelf", es);
+   evas_object_data_set(es->comp_object, "comp_skip", (void*)1);
    evas_object_name_set(es->comp_object, es->name);
    evas_object_layer_set(es->comp_object, layer);
    evas_object_lower(es->comp_object);

-- 


Reply via email to