Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_text.c
Log Message:
get font sizes right even if text object is NULL string..
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- evas_object_text.c 31 Jan 2005 15:03:37 -0000 1.33
+++ evas_object_text.c 7 Feb 2005 02:25:27 -0000 1.34
@@ -181,9 +181,6 @@
o->engine_data,
o->cur.text,
&w, &h);
- obj->cur.geometry.w = w;
- obj->cur.geometry.h = h;
- obj->cur.cache.geometry.validity = 0;
o->ascent =
obj->layer->evas->engine.func->font_ascent_get(obj->layer->evas->engine.data.output,
o->engine_data);
o->descent =
obj->layer->evas->engine.func->font_descent_get(obj->layer->evas->engine.data.output,
@@ -192,12 +189,12 @@
o->engine_data);
o->max_descent =
obj->layer->evas->engine.func->font_max_descent_get(obj->layer->evas->engine.data.output,
o->engine_data);
+ obj->cur.geometry.w = w;
+ obj->cur.geometry.h = o->max_ascent + o->max_descent;
+ obj->cur.cache.geometry.validity = 0;
}
else
{
- obj->cur.geometry.w = 0;
- obj->cur.geometry.h = o->max_ascent + o->max_descent;
- obj->cur.cache.geometry.validity = 0;
if (o->engine_data)
{
o->ascent =
obj->layer->evas->engine.func->font_ascent_get(obj->layer->evas->engine.data.output,
@@ -216,6 +213,9 @@
o->max_ascent = 0;
o->max_descent = 0;
}
+ obj->cur.geometry.w = 0;
+ obj->cur.geometry.h = o->max_ascent + o->max_descent;
+ obj->cur.cache.geometry.validity = 0;
}
o->changed = 1;
evas_object_change(obj);
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
