From 9ffa06fbf6b4aa3d816df4d15e3b8a7147cb2200 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:31:33 +0000 Subject: [PATCH] Evas textblock: Adjusted text drawing a bit, a fix to the previous commit. SVN revision: 56408 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 6 +++--- 1 file 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 3c1334b75c..845b46ee49 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -7616,7 +7616,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void if (pback && !EINA_INLIST_GET(itr)->next) { - DRAW_RECT(backx, 0, itr->w, ln->h, r, g, b, a); + DRAW_RECT(itr->x, 0, itr->w, ln->h, r, g, b, a); } pback = (ti) ? ti->format->backing : pback; backx = itr->x; @@ -7790,7 +7790,6 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void g = ti->format->color.underline.g; b = ti->format->color.underline.b; a = ti->format->color.underline.a; - linex = itr->x; } else { @@ -7803,6 +7802,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void DRAW_RECT(itr->x, ln->baseline + 1, itr->w, 1, r, g, b, a); } pline = (ti) ? ti->format->underline : pline; + linex = itr->x; /* UNDERLINE2 */ if ((pline2) && (itr->x > line2x)) @@ -7819,7 +7819,6 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void g2 = ti->format->color.underline2.g; b2 = ti->format->color.underline2.b; a2 = ti->format->color.underline2.a; - line2x = itr->x; } else { @@ -7832,6 +7831,7 @@ evas_object_textblock_render(Evas_Object *obj, void *output, void *context, void DRAW_RECT(itr->x, ln->baseline + 3, itr->w, 1, r2, g2, b2, a2); } pline2 = (ti) ? ti->format->underline2 : pline2; + line2x = itr->x; } ITEM_WALK_END(); }