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:
66e1cc2
)
Evas textblock: Don't include right margin/padding twice when aligning lines.
author
Tom Hacohen
<tom@stosb.com>
Fri, 14 Mar 2014 12:50:28 +0000
(12:50 +0000)
committer
Tom Hacohen
<tom@stosb.com>
Fri, 14 Mar 2014 12:54:09 +0000
(12:54 +0000)
This should fix enventor issues.
@fix
src/lib/evas/canvas/evas_object_textblock.c
patch
|
blob
|
history
diff --git
a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index
4956ac9
..
de9885c
100644
(file)
--- a/
src/lib/evas/canvas/evas_object_textblock.c
+++ b/
src/lib/evas/canvas/evas_object_textblock.c
@@
-3389,10
+3389,11
@@
loop_advance:
c->y += c->ascent + c->descent;
if (c->w >= 0)
{
+ /* c->o->style_pad.r is already included in the line width, so it's
+ * not used in this calculation. . */
c->ln->x = c->marginl + c->o->style_pad.l +
((c->w - c->ln->w -
- c->o->style_pad.l - c->o->style_pad.r -
- c->marginl - c->marginr) * _layout_line_align_get(c));
+ c->o->style_pad.l - c->marginl) * _layout_line_align_get(c));
}
else
{