forked from enlightenment/efl
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
This commit is contained in:
parent
483e496d35
commit
28ee865391
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue