fix underline and strikethrough drawing in textgrid.
authorraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 18 Jun 2012 13:54:18 +0000 (13:54 +0000)
committerraster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 18 Jun 2012 13:54:18 +0000 (13:54 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@72405 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/canvas/evas_object_textgrid.c

index 7b98954..e2588b9 100644 (file)
@@ -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;
      }