Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_private.h edje_text.c
Log Message:
break out of while loops!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- edje_private.h 13 Jul 2003 06:19:09 -0000 1.28
+++ edje_private.h 15 Jul 2003 02:21:58 -0000 1.29
@@ -28,7 +28,7 @@
* real part size and "before min/max limit" sizes need to be stored per part
* need to be able to calculate min & max size of a whole edje
*
- * swallowed objects need to be able to adversize min/max size
+ * swallowed objects need to be able to advertise min/max size
*
* need to be able to list collections in an eet file
*
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_text.c 13 Jul 2003 02:06:46 -0000 1.2
+++ edje_text.c 15 Jul 2003 02:21:58 -0000 1.3
@@ -290,6 +290,7 @@
if ((psize - size) <= 0) size = psize - 1;
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
+ if ((size > 0) && (tw == 0)) break;
}
}
else if (tw < sw)
@@ -304,6 +305,7 @@
if ((psize - size) >= 0) size = psize + 1;
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
+ if ((size > 0) && (tw == 0)) break;
}
size = psize;
}
@@ -317,14 +319,17 @@
if (th < sh)
{
int dif;
+ double change;
dif = (th - sh) / 4;
if (dif < 1) dif = 1;
+ change = 0;
while ((th < sh) && (sw > 0.0))
{
size += dif;
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
+ if ((size > 0) && (th == 0)) break;
}
size -= dif;
}
@@ -339,6 +344,7 @@
size -= dif;
evas_object_text_font_set(ep->object, font, size);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
+ if ((size > 0) && (th == 0)) break;
}
}
}
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
