fix icons stacking/clip

SVN revision: 18381

diff --git a/src/bin/e_box.c b/src/bin/e_box.c
index 41619df10d78c8efcc1614d4f228529ab3351309..88314747a2543889cd833d73e768b02599db607f 100644 (file)
--- a/src/bin/e_box.c
+++ b/src/bin/e_box.c
@@ -370,7 +370,7 @@ _e_box_smart_disown(Evas_Object *obj)
    evas_object_event_callback_del(obj,
                                  EVAS_CALLBACK_FREE,
                                  _e_box_smart_item_del_hook);
-   evas_object_smart_member_del(bi->sd->obj);
+   evas_object_smart_member_del(obj);
    evas_object_clip_unset(obj);
    evas_object_data_del(obj, "e_box_data");
    free(bi);

diff --git a/src/bin/e_icon_layout.c b/src/bin/e_icon_layout.c
index d406206d5921460f6c4b1959aff24edfd48e723b..ce139c726d949cb94e9613665261e71e856c98d3 100644 (file)
--- a/src/bin/e_icon_layout.c
+++ b/src/bin/e_icon_layout.c
@@ -48,10 +48,6 @@ static void _e_icon_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coo
 static void _e_icon_layout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
 static void _e_icon_layout_smart_clip_set(Evas_Object *obj, Evas_Object *clip);
 static void _e_icon_layout_smart_clip_unset(Evas_Object *obj);
-static void _e_icon_layout_smart_raise(Evas_Object *obj);
-static void _e_icon_layout_smart_lower(Evas_Object *obj);
-static void _e_icon_layout_smart_stack_below(Evas_Object *obj, Evas_Object *below);
-static void _e_icon_layout_smart_stack_above(Evas_Object *obj, Evas_Object *above);
 
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
@@ -347,7 +343,7 @@ _e_icon_layout_smart_disown(Evas_Object *obj)
    evas_object_event_callback_del(obj,
                                  EVAS_CALLBACK_FREE,
                                  _e_icon_layout_smart_item_del_hook);
-   evas_object_smart_member_del(li->sd->obj);
+   evas_object_smart_member_del(obj);
    evas_object_data_del(obj, "e_icon_layout_data");
    free(li);
 }
@@ -442,6 +438,7 @@ _e_icon_layout_smart_reconfigure(E_Smart_Data *sd)
 static void
 _e_icon_layout_smart_move_resize_item(E_Icon_Layout_Item *li)
 {                                     
+   /* FIXME: this will get slow with 1000's of objects. be smarter. */
    if(li->w == 0 || li->h == 0)
      {
        evas_object_geometry_get(li->obj, NULL, NULL, &li->w, &li->h);
@@ -458,11 +455,7 @@ _e_icon_layout_smart_init(void)
    _e_smart = evas_smart_new("e_icon_layout",
                             _e_icon_layout_smart_add,
                             _e_icon_layout_smart_del,
-                            NULL, 
-                            _e_icon_layout_smart_raise, 
-                            _e_icon_layout_smart_lower,
-                            _e_icon_layout_smart_stack_above, 
-                            _e_icon_layout_smart_stack_below,
+                            NULL, NULL, NULL, NULL, NULL,
                             _e_icon_layout_smart_move,
                             _e_icon_layout_smart_resize,
                             _e_icon_layout_smart_show,
@@ -543,58 +536,6 @@ _e_icon_layout_smart_del(Evas_Object *obj)
    free(sd);
 }
 
-static void 
-_e_icon_layout_smart_raise(Evas_Object *obj)
-{
-   E_Smart_Data *sd;
-   Evas_List *l;
-   
-   sd = evas_object_smart_data_get(obj);
-   
-   if (!sd) return;
-   for(l = sd->items; l; l = l->next)
-     evas_object_raise(l->data);
-}
-
-static void 
-_e_icon_layout_smart_lower(Evas_Object *obj)
-{
-   E_Smart_Data *sd;
-   Evas_List *l;
-   
-   sd = evas_object_smart_data_get(obj);
-   
-   if (!sd) return;
-   for(l = sd->items; l; l = l->next)
-     evas_object_lower(l->data);
-}  
-
-static void
-_e_icon_layout_smart_stack_above(Evas_Object *obj, Evas_Object *above)
-{
-   E_Smart_Data *sd;
-   Evas_List *l;
-   
-   sd = evas_object_smart_data_get(obj);
-   
-   if (!sd) return;
-   for(l = sd->items; l; l = l->next)
-     evas_object_stack_above(l->data, above);
-}
-
-static void
-_e_icon_layout_smart_stack_below(Evas_Object *obj, Evas_Object *below)
-{
-   E_Smart_Data *sd;
-   Evas_List *l;
-   
-   sd = evas_object_smart_data_get(obj);
-   
-   if (!sd) return;
-   for(l = sd->items; l; l = l->next)
-     evas_object_stack_above(l->data, below);
-}
-
 static void
 _e_icon_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
@@ -605,23 +546,25 @@ _e_icon_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
    if (!sd) return;
    if ((x == sd->x) && (y == sd->y)) return;
    if ((x == sd->x) && (y == sd->y)) return;
-    {
-       Evas_List *l;
-       Evas_Coord dx, dy;
-       
-       if(!sd->clip_frozen)
-        evas_object_move(sd->clip, x, y);
-       
-       dx = x - sd->x;
-       dy = y - sd->y;
-       for (l = sd->items; l; l = l->next)
-       {
-          Evas_Coord ox, oy;
-          
-          evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
-          evas_object_move(l->data, ox + dx, oy + dy);
-       }
-    }
+   
+   /* FIXME: this will get slow with 1000's of objects. be smarter. */
+     {
+       Evas_List *l;
+       Evas_Coord dx, dy;
+       
+       if (!sd->clip_frozen)
+         evas_object_move(sd->clip, x, y);
+       
+       dx = x - sd->x;
+       dy = y - sd->y;
+       for (l = sd->items; l; l = l->next)
+         {
+            Evas_Coord ox, oy;
+            
+            evas_object_geometry_get(l->data, &ox, &oy, NULL, NULL);
+            evas_object_move(l->data, ox + dx, oy + dy);
+         }
+     }
    sd->x = x;
    sd->y = y;
 }

diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index 3a962af091cb8fef64ba25603613a9b3226f9180..7fa2b9be0c73962461533c92b07313cb0261ad60 100644 (file)
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -263,7 +263,7 @@ _e_layout_smart_disown(Evas_Object *obj)
    evas_object_event_callback_del(obj,
                                  EVAS_CALLBACK_FREE,
                                  _e_layout_smart_item_del_hook);
-   evas_object_smart_member_del(li->sd->obj);
+   evas_object_smart_member_del(obj);
    evas_object_data_del(obj, "e_layout_data");
    free(li);
 }

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 908d430f29c244eed43ce9374d9d0f52249ade31..36d7c6e04a1ab68a058f4928add46dcd1edaee3c 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -267,9 +267,8 @@ main(int argc, char **argv)
      }
    _e_main_shutdown_push(ecore_shutdown);
    
-/* disabled for now - seems to break config loading??? */   
    _e_cacheburst++;
-   eet_cacheburst(_e_cacheburst);
+//   eet_cacheburst(_e_cacheburst);
    ecore_timer_add(5.0, _e_main_cb_eet_cacheburst_end, NULL);
    
     /* init the file system */
@@ -1092,7 +1091,7 @@ _e_main_cb_idler_before(void *data __UNUSED__)
          }
      }
    _e_cacheburst--;
-   eet_cacheburst(_e_cacheburst);
+//   eet_cacheburst(_e_cacheburst);
    edje_thaw();
 //   printf("IN to idle... %3.3f\n", ecore_time_get());
    return 1;
@@ -1104,7 +1103,7 @@ _e_main_cb_idler_after(void *data __UNUSED__)
 //   printf("OUT of idle... %3.3f\n", ecore_time_get());
    edje_freeze();
    _e_cacheburst++;
-   eet_cacheburst(_e_cacheburst);
+//   eet_cacheburst(_e_cacheburst);
    return 1;
 }
 
@@ -1112,7 +1111,7 @@ static int
 _e_main_cb_eet_cacheburst_end(void *data __UNUSED__)
 {
    _e_cacheburst--;
-   eet_cacheburst(_e_cacheburst);
+//   eet_cacheburst(_e_cacheburst);
    return 0;
 }
 

diff --git a/src/bin/e_table.c b/src/bin/e_table.c
index a21e1adbc29d3442a62c6f98d2f7302587c98db2..6e5d84e6ada82472d3ca34853a78b391aadb5a1a 100644 (file)
--- a/src/bin/e_table.c
+++ b/src/bin/e_table.c
@@ -273,7 +273,7 @@ _e_table_smart_disown(Evas_Object *obj)
    evas_object_event_callback_del(obj,
                                  EVAS_CALLBACK_FREE,
                                  _e_table_smart_item_del_hook);
-   evas_object_smart_member_del(ti->sd->obj);
+   evas_object_smart_member_del(obj);
    evas_object_data_del(obj, "e_table_data");
    free(ti);
 }