[EGIT] [core/efl] master 02/02: Evas font: Fix initialization of ascent/descent for empty objects.

[Tom Hacohen - Enlightenment Git]

tasn pushed a commit to branch master.

commit f2317ac8759c749f37d705fe6c7929147cc9214a
Author: Tom Hacohen <t...@stosb.com>
Date:   Fri Jun 7 18:09:30 2013 +0100

    Evas font: Fix initialization of ascent/descent for empty objects.
---
 src/lib/evas/canvas/evas_object_text.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_text.c 
b/src/lib/evas/canvas/evas_object_text.c
index e967748..35881bb 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2391,6 +2391,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, 
Eina_Unicode *text)
    _evas_object_text_layout(eo_obj, o, text);
 
    /* Calc ascent/descent. */
+   if (o->items)
      {
         Evas_Object_Text_Item *item;
 
@@ -2411,10 +2412,16 @@ _evas_object_text_recalc(Evas_Object *eo_obj, 
Eina_Unicode *text)
              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