summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2011-02-24 08:43:30 +0000
committerTom Hacohen <tom@stosb.com>2011-02-24 08:43:30 +0000
commit28ee865391548e42b41c20aeebd98a80997f5f69 (patch)
tree4f03f8edc1b3ccbfe192343afeb87b2125c78ae7 /legacy
parent483e496d35d7138590b50afe9068ca82fb0fa146 (diff)
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. SVN revision: 57294
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textblock.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index c601dda6e8..4cb39e6519 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -3897,11 +3897,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
3897 Evas_Object_Textblock *o; 3897 Evas_Object_Textblock *o;
3898 3898
3899 o = (Evas_Object_Textblock *)(obj->object_data); 3899 o = (Evas_Object_Textblock *)(obj->object_data);
3900 if (o->markup_text) 3900 _evas_textblock_text_node_changed(o, obj, NULL);
3901 {
3902 free(o->markup_text);
3903 o->markup_text = NULL;
3904 }
3905 } 3901 }
3906 3902
3907 _style_clear(ts); 3903 _style_clear(ts);
@@ -3992,24 +3988,6 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
3992 p++; 3988 p++;
3993 } 3989 }
3994 } 3990 }
3995
3996 EINA_LIST_FOREACH(ts->objects, l, obj)
3997 {
3998 Evas_Object_Textblock *o;
3999
4000 o = (Evas_Object_Textblock *)(obj->object_data);
4001 if (o->markup_text)
4002 {
4003 char *m;
4004
4005 m = strdup(o->markup_text);
4006 if (m)
4007 {
4008 evas_object_textblock_text_markup_set(obj, m);
4009 free(m);
4010 }
4011 }
4012 }
4013} 3991}
4014 3992
4015/** 3993/**