summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evas/AUTHORS1
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textgrid.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/legacy/evas/AUTHORS b/legacy/evas/AUTHORS
index 851c24f888..f0ec1ed41d 100644
--- a/legacy/evas/AUTHORS
+++ b/legacy/evas/AUTHORS
@@ -39,3 +39,4 @@ Daniel Zaoui <daniel.zaoui@samsung.com>
39Christophe Sadoine <chris@indefini.org> 39Christophe Sadoine <chris@indefini.org>
40Igor Murzov <e-mail@date.by> 40Igor Murzov <e-mail@date.by>
41Sohyun Kim <anna1014.kim@samsung.com> 41Sohyun Kim <anna1014.kim@samsung.com>
42Boris Faure <billiob@gmail.com>
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
index d6a913864b..171485ff0b 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
@@ -621,7 +621,8 @@ evas_object_textgrid_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
621 evas_object_textgrid_row_rect_append(row, rx, rw, 621 evas_object_textgrid_row_rect_append(row, rx, rw,
622 rr, rg, rb, ra); 622 rr, rg, rb, ra);
623 } 623 }
624 if (cells->codepoint > 0) 624 if ((cells->codepoint > 0) || (cells->underline) ||
625 (cells->strikethrough))
625 { 626 {
626 if (cells->fg_extended) palette = &(o->cur.palette_extended); 627 if (cells->fg_extended) palette = &(o->cur.palette_extended);
627 else palette = &(o->cur.palette_standard); 628 else palette = &(o->cur.palette_standard);
@@ -633,7 +634,7 @@ evas_object_textgrid_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
633 cells->codepoint, 634 cells->codepoint,
634 c->r, c->g, c->b, c->a); 635 c->r, c->g, c->b, c->a);
635 // XXX: underlines and strikethroughs dont get 636 // XXX: underlines and strikethroughs dont get
636 // merghed into horizontal runs like bg rects above 637 // merged into horizontal runs like bg rects above
637 if (cells->underline) 638 if (cells->underline)
638 evas_object_textgrid_row_line_append(row, xp, w, 639 evas_object_textgrid_row_line_append(row, xp, w,
639 o->max_ascent + 1, 640 o->max_ascent + 1,