Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_load.c edje_main.c edje_text.c
Log Message:
hmm - dont delete swallowed child objects... too much implicit stuff..
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- edje_load.c 1 Apr 2004 15:32:17 -0000 1.40
+++ edje_load.c 18 May 2004 04:21:22 -0000 1.41
@@ -528,7 +528,8 @@
evas_object_event_callback_del(rp->swallowed_object,
EVAS_CALLBACK_FREE,
_edje_object_part_swallow_free_cb);
- evas_object_del(rp->swallowed_object);
+/* I think it would be better swallowed objects dont get deleted */
+/* evas_object_del(rp->swallowed_object);*/
}
if (rp->text.text) free(rp->text.text);
if (rp->text.font) free(rp->text.font);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_main.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- edje_main.c 28 Apr 2004 01:53:30 -0000 1.35
+++ edje_main.c 18 May 2004 04:21:22 -0000 1.36
@@ -41,8 +41,8 @@
ed->clipper = evas_object_rectangle_add(ed->evas);
evas_object_smart_member_add(ed->clipper, obj);
evas_object_color_set(ed->clipper, 255, 255, 255, 255);
- evas_object_move(ed->clipper, -1000000, -1000000);
- evas_object_resize(ed->clipper, 2000000, 2000000);
+ evas_object_move(ed->clipper, -10000, -10000);
+ evas_object_resize(ed->clipper, 20000, 20000);
evas_object_pass_events_set(ed->clipper, 1);
ed->have_objects = 1;
ed->references = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_text.c 27 Apr 2004 08:16:13 -0000 1.15
+++ edje_text.c 18 May 2004 04:21:22 -0000 1.16
@@ -342,7 +342,7 @@
int psize;
psize = size;
- while ((tw > sw) && (size > 0))
+ while ((tw > sw) && (size > 0) && (tw != 0))
{
psize = size;
size = (size * sw) / tw;
@@ -357,7 +357,7 @@
int psize;
psize = size;
- while ((tw < sw) && (size > 0))
+ while ((tw < sw) && (size > 0) && (tw != 0))
{
psize = size;
size = (size * sw) / tw;
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
