projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a5b27c
)
Evas textblock: Use advance when calculating line breaks and widths.
author
Tom Hacohen
<tom@stosb.com>
Wed, 1 Jun 2011 14:25:11 +0000
(14:25 +0000)
committer
Tom Hacohen
<tom@stosb.com>
Wed, 1 Jun 2011 14:25:11 +0000
(14:25 +0000)
SVN revision: 59870
legacy/evas/src/lib/canvas/evas_object_textblock.c
patch
|
blob
|
history
diff --git
a/legacy/evas/src/lib/canvas/evas_object_textblock.c
b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index
c0a5d73
..
e562d80
100644
(file)
--- a/
legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/
legacy/evas/src/lib/canvas/evas_object_textblock.c
@@
-2446,7
+2446,7
@@
loop_advance:
it->x = x;
x += it->adv;
- if ((it->x + it->
w) > c->ln->w) c->ln->w = it->x + it->w
;
+ if ((it->x + it->
adv) > c->ln->w) c->ln->w = it->x + it->adv
;
}
c->ln->y = (c->y - c->par->y) + c->o->style_pad.t;
@@
-3519,7
+3519,7
@@
_layout_visualize_par(Ctxt *c)
/* Check if we need to wrap, i.e the text is bigger than the width,
or we already found a wrap point. */
if ((c->w >= 0) &&
- (((c->x + it->
w
) >
+ (((c->x + it->
adv
) >
(c->w - c->o->style_pad.l - c->o->style_pad.r -
c->marginl - c->marginr)) || (wrap > 0)))
{