From 4d61bb8329dee1494f56781f24f9983c150b9d16 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 14 Dec 2011 13:43:13 +0000 Subject: [PATCH] Evas textblock: Fixed a couple of issues caused by previous commits. SVN revision: 66194 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 6ee074dadd..b14af7a934 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3200,7 +3200,7 @@ _layout_do_format(const Evas_Object *obj __UNUSED__, Ctxt *c, fi->parent.w = fi->parent.adv = 0; } - else if ((!strcmp(item, "\t")) || (!strcmp(item, "\\t"))) + else if (_IS_TAB(item)) { Evas_Object_Textblock_Format_Item *fi; @@ -6068,6 +6068,8 @@ _evas_textblock_format_is_visible(Evas_Object_Textblock_Node_Format *fnode, * closing */ if ((!strncmp(item, "\n", itlen) || !strncmp(item, "\\n", itlen)) || (!strncmp(item, "\t", itlen) || !strncmp(item, "\\t", itlen)) || + (!strncmp(item, "br", itlen) && (itlen >= 2)) || + (!strncmp(item, "tab", itlen) && (itlen >= 3)) || (!strncmp(item, "ps", itlen) && (itlen >= 2)) || (!strncmp(item, "item", itlen) && (itlen >= 4) && is_opener)) {