From: raster Date: Mon, 18 Jun 2012 13:54:18 +0000 (+0000) Subject: fix underline and strikethrough drawing in textgrid. X-Git-Tag: submit/trunk/20120815.174732~199 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af29eb10cb30dc1a77a664e1e8c6177c58020e4;p=profile%2Fivi%2Fevas.git fix underline and strikethrough drawing in textgrid. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@72405 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/canvas/evas_object_textgrid.c b/src/lib/canvas/evas_object_textgrid.c index 7b98954..e2588b9 100644 --- a/src/lib/canvas/evas_object_textgrid.c +++ b/src/lib/canvas/evas_object_textgrid.c @@ -423,13 +423,13 @@ evas_object_textgrid_render(Evas_Object *obj, void *output, void *context, void // XXX: underlines and strikethroughs dont get // merghed into horizontal runs like bg rects above if (cells->underline) - evas_object_textgrid_row_line_append(row, rx, rw, + evas_object_textgrid_row_line_append(row, xp, w, o->max_ascent + 1, - rr, rg, rb, ra); + c->r, c->g, c->b, c->a); if (cells->strikethrough) - evas_object_textgrid_row_line_append(row, rx, rw, + evas_object_textgrid_row_line_append(row, xp, w, ((3 * o->max_ascent) / 4), - rr, rg, rb, ra); + c->r, c->g, c->b, c->a); } } xp += w; @@ -473,7 +473,7 @@ evas_object_textgrid_render(Evas_Object *obj, void *output, void *context, void row->lines[xx].b, row->lines[xx].a); ENFN->rectangle_draw(output, context, surface, xp + row->lines[xx].x, yp + row->lines[xx].y, - row->lines[xx].w, h); + row->lines[xx].w, 1); } yp += h; }