Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_text.c
Log Message:
fix fonts in OTHEr states than default! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_text.c 30 Aug 2004 08:07:00 -0000 1.19
+++ edje_text.c 7 Sep 2004 14:48:41 -0000 1.20
@@ -361,6 +361,7 @@
{
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@@ -376,6 +377,7 @@
if ((psize - size) <= 0) size = psize - 1;
if (inlined_font) evas_object_text_font_source_set(ep->object,
ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
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;
@@ -393,6 +395,7 @@
if ((psize - size) >= 0) size = psize + 1;
if (inlined_font) evas_object_text_font_source_set(ep->object,
ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
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;
@@ -405,6 +408,7 @@
size = sh;
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@@ -420,6 +424,7 @@
if (size <= 0) break;
if (inlined_font) evas_object_text_font_source_set(ep->object,
ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
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;
@@ -438,6 +443,7 @@
if (size <= 0) break;
if (inlined_font) evas_object_text_font_source_set(ep->object,
ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
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;
@@ -454,6 +460,7 @@
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@@ -580,6 +587,7 @@
if (inlined_font) evas_object_text_font_source_set(ep->object, ed->path);
else evas_object_text_font_source_set(ep->object, NULL);
+
evas_object_text_font_set(ep->object, font, size);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
@@ -607,6 +615,7 @@
o = l->data;
if (inlined_font) evas_object_text_font_source_set(o, ed->path);
else evas_object_text_font_source_set(o, NULL);
+
evas_object_text_font_set(o, font, size);
evas_object_text_text_set(o, text);
evas_object_move(o,
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
