From 78eba185efc304922943ebd86d66e1454a9c1248 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 7 Mar 2010 07:29:26 +0000 Subject: [PATCH] according to dottedmag - this breaks things... i dndt see them - but.. lets revert for now. i dont like breaks. :) SVN revision: 46935 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index e2652b7d62..2cc96f235e 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -1306,7 +1306,7 @@ _layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt) descent = c->ENFN->font_max_descent_get(c->ENDT, fmt->font.font); if (fmt->linesize > 0) { - if ((ascent + descent) > 0) + if ((ascent + descent) < fmt->linesize) { ascent = ((fmt->linesize * ascent) / (ascent + descent)); descent = fmt->linesize - ascent; @@ -1317,8 +1317,8 @@ _layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt) descent = ((ascent + descent) * fmt->linerelsize) - (ascent * fmt->linerelsize); ascent = ascent * fmt->linerelsize; } - c->maxascent = ascent; - c->maxdescent = descent; + if (c->maxascent < ascent) c->maxascent = ascent; + if (c->maxdescent < descent) c->maxdescent = descent; } }