From 30269f09a6a0f8f993965be167388313b9617dad Mon Sep 17 00:00:00 2001 From: tasn Date: Thu, 24 Feb 2011 08:43:30 +0000 Subject: [PATCH] Evas textblock: Fix wrong behavior when updating style. When updating style we should not clear the utf8 text but we should relayout. And definitely not reset it. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@57294 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index c601dda..4cb39e6 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -3897,11 +3897,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) Evas_Object_Textblock *o; o = (Evas_Object_Textblock *)(obj->object_data); - if (o->markup_text) - { - free(o->markup_text); - o->markup_text = NULL; - } + _evas_textblock_text_node_changed(o, obj, NULL); } _style_clear(ts); @@ -3992,24 +3988,6 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) p++; } } - - EINA_LIST_FOREACH(ts->objects, l, obj) - { - Evas_Object_Textblock *o; - - o = (Evas_Object_Textblock *)(obj->object_data); - if (o->markup_text) - { - char *m; - - m = strdup(o->markup_text); - if (m) - { - evas_object_textblock_text_markup_set(obj, m); - free(m); - } - } - } } /** -- 2.7.4