tasn pushed a commit to branch evas-1.7.
commit cfa6614c95956fdc48bf49493d817bdb034207fc
Author: Tom Hacohen <[email protected]>
Date: Fri Jun 7 18:12:41 2013 +0100
Evas font: Fix initialization of ascent/descent for empty objects.
---
src/lib/canvas/evas_object_text.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/lib/canvas/evas_object_text.c
b/src/lib/canvas/evas_object_text.c
index 4c22a9d..705741e 100644
--- a/src/lib/canvas/evas_object_text.c
+++ b/src/lib/canvas/evas_object_text.c
@@ -1909,6 +1909,7 @@ _evas_object_text_recalc(Evas_Object *obj)
if (text) free(text);
/* Calc ascent/descent. */
+ if (o->items)
{
Evas_Object_Text_Item *item;
@@ -1928,11 +1929,16 @@ _evas_object_text_recalc(Evas_Object *obj)
o->ascent = asc;
if (desc > o->descent)
o->descent = desc;
-
- o->max_ascent = o->ascent;
- o->max_descent = o->descent;
}
}
+ else if (o->font)
+ {
+ o->ascent = ENFN->font_ascent_get(ENDT, o->font);
+ o->descent = ENFN->font_descent_get(ENDT, o->font);
+ }
+
+ o->max_ascent = o->ascent;
+ o->max_descent = o->descent;
if ((o->font) && (o->items))
{
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
