From: Tom Hacohen <tom@stosb.com>
Date: Fri, 14 Mar 2014 12:50:28 +0000 (+0000)
Subject: Evas textblock: Don't include right margin/padding twice when aligning lines.
X-Git-Tag: v1.9.0+464+gcaabcbe~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2eaf9049b9f97bf95461c77a7d351222fc457e49;p=platform%2Fupstream%2Fefl.git

Evas textblock: Don't include right margin/padding twice when aligning lines.

This should fix enventor issues.

@fix
---

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 4956ac9..de9885c 100644
--- 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
      {