Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
off by 1 native size fixed
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- evas_object_textblock.c 24 Feb 2005 10:29:04 -0000 1.46
+++ evas_object_textblock.c 2 Mar 2005 05:22:20 -0000 1.47
@@ -1333,6 +1333,8 @@
layout.line.inset)) * layout.align;
if ((layout.line.x + hadvance) > fw)
fw = layout.line.x + hadvance;
+ else if ((layout.line.x + tw) > fw)
+ fw = layout.line.x + tw;
layout.line.x += hadvance;
lnode->layout.line.advance = hadvance;
for (ll = l->next; ll; ll = ll->next)
@@ -1365,6 +1367,10 @@
}
lnode->line_end = 1;
fh = layout.line.y + layout.line.mascent +
layout.line.mdescent;
+ if ((lnode->layout.line.x + lnode->layout.line.advance)
> fw)
+ fw = lnode->layout.line.x + lnode->layout.line.advance;
+ else if ((lnode->layout.line.x + lnode->w) > fw)
+ fw = lnode->layout.line.x + lnode->w;
}
}
/* text doesnt fit */
@@ -1463,6 +1469,10 @@
{
/* FIXME: this node would overflow to the next
textblock */
}
+ if ((lnode->layout.line.x +
lnode->layout.line.advance) > fw)
+ fw = lnode->layout.line.x +
lnode->layout.line.advance;
+ else if ((lnode->layout.line.x + lnode->w) > fw)
+ fw = lnode->layout.line.x + lnode->w;
last_line_underline = 0;
last_line_double_underline = 0;
line++;
@@ -1517,6 +1527,10 @@
{
/* FIXME: this node would overflow to the next
textblock */
}
+ if ((lnode->layout.line.x + lnode->layout.line.advance)
> fw)
+ fw = lnode->layout.line.x + lnode->layout.line.advance;
+ else if ((lnode->layout.line.x + lnode->w) > fw)
+ fw = lnode->layout.line.x + lnode->w;
last_line_underline = 0;
last_line_double_underline = 0;
line++;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
