From 0f39910d929cdd553af50256fb8208b61f56d8fb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 7 Feb 2005 02:25:27 +0000 Subject: [PATCH] get font sizes right even if text object is NULL string.. SVN revision: 13212 --- legacy/evas/src/lib/canvas/evas_object_text.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index 2a14f226f7..60411309df 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -181,9 +181,6 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz 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 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz 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 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz 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);