summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-03-07 07:29:26 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-03-07 07:29:26 +0000
commit78eba185efc304922943ebd86d66e1454a9c1248 (patch)
tree77d2772ca0066119a70990bc248ba25a59f6f513
parentb3019e3d4b70e849c76fe0a71ed8c41bab645965 (diff)
according to dottedmag - this breaks things... i dndt see them - but.. lets
revert for now. i dont like breaks. :) SVN revision: 46935
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textblock.c6
1 files 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)
1306 descent = c->ENFN->font_max_descent_get(c->ENDT, fmt->font.font); 1306 descent = c->ENFN->font_max_descent_get(c->ENDT, fmt->font.font);
1307 if (fmt->linesize > 0) 1307 if (fmt->linesize > 0)
1308 { 1308 {
1309 if ((ascent + descent) > 0) 1309 if ((ascent + descent) < fmt->linesize)
1310 { 1310 {
1311 ascent = ((fmt->linesize * ascent) / (ascent + descent)); 1311 ascent = ((fmt->linesize * ascent) / (ascent + descent));
1312 descent = fmt->linesize - ascent; 1312 descent = fmt->linesize - ascent;
@@ -1317,8 +1317,8 @@ _layout_format_ascent_descent_adjust(Ctxt *c, Evas_Object_Textblock_Format *fmt)
1317 descent = ((ascent + descent) * fmt->linerelsize) - (ascent * fmt->linerelsize); 1317 descent = ((ascent + descent) * fmt->linerelsize) - (ascent * fmt->linerelsize);
1318 ascent = ascent * fmt->linerelsize; 1318 ascent = ascent * fmt->linerelsize;
1319 } 1319 }
1320 c->maxascent = ascent; 1320 if (c->maxascent < ascent) c->maxascent = ascent;
1321 c->maxdescent = descent; 1321 if (c->maxdescent < descent) c->maxdescent = descent;
1322 } 1322 }
1323} 1323}
1324 1324