according to dottedmag - this breaks things... i dndt see them - but.. lets

revert for now. i dont like breaks. :)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@46935 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index e2652b7..2cc96f2 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/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;
      }
 }