evas_text_grid: ' ' can be underlined or striken through

+ typo

SVN revision: 78284

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>
 Christophe Sadoine <chris@indefini.org>
 Igor Murzov <e-mail@date.by>
 Sohyun Kim <anna1014.kim@samsung.com>
+Boris 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
                   evas_object_textgrid_row_rect_append(row, rx, rw,
                                                        rr, rg, rb, ra);
                }
-             if (cells->codepoint > 0)
+             if ((cells->codepoint > 0) || (cells->underline) ||
+                 (cells->strikethrough))
                {
                   if (cells->fg_extended) palette = &(o->cur.palette_extended);
                   else palette = &(o->cur.palette_standard);
@@ -633,7 +634,7 @@ evas_object_textgrid_render(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
                                                             cells->codepoint,
                                                             c->r, c->g, c->b, c->a);
                        // XXX: underlines and strikethroughs dont get
-                       // merghed into horizontal runs like bg rects above
+                       // merged into horizontal runs like bg rects above
                        if (cells->underline)
                          evas_object_textgrid_row_line_append(row, xp, w,
                                                               o->max_ascent + 1,