Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_box.c e_icon_layout.c e_layout.c e_main.c e_table.c
Log Message:
fix icons stacking/clip
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_box.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_box.c 3 Nov 2005 06:17:08 -0000 1.12
+++ e_box.c 8 Nov 2005 13:02:19 -0000 1.13
@@ -370,7 +370,7 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_layout.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_icon_layout.c 7 Nov 2005 15:31:08 -0000 1.15
+++ e_icon_layout.c 8 Nov 2005 13:02:19 -0000 1.16
@@ -48,10 +48,6 @@
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 @@
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 @@
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_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 @@
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 @@
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;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_layout.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_layout.c 2 Nov 2005 04:05:13 -0000 1.8
+++ e_layout.c 8 Nov 2005 13:02:19 -0000 1.9
@@ -263,7 +263,7 @@
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);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- e_main.c 3 Nov 2005 15:09:17 -0000 1.136
+++ e_main.c 8 Nov 2005 13:02:19 -0000 1.137
@@ -267,9 +267,8 @@
}
_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_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 @@
// 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 @@
_e_main_cb_eet_cacheburst_end(void *data __UNUSED__)
{
_e_cacheburst--;
- eet_cacheburst(_e_cacheburst);
+// eet_cacheburst(_e_cacheburst);
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_table.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_table.c 2 Nov 2005 04:05:13 -0000 1.9
+++ e_table.c 8 Nov 2005 13:02:19 -0000 1.10
@@ -273,7 +273,7 @@
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);
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
