timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Canvas layout: fix Efl.text (non-legacy) TEXT parts 

Current implementation should also support TEXT parts (like button)
with usage of efl_text_set.

Follow-up to 0061a4bb34.
This commit is contained in:
Daniel Hirt 2017-10-02 11:03:37 +03:00
parent 10ba064b65
commit eadf313702
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/edje/edje_util.c
View File

@ -1861,25 +1861,19 @@ _edje_object_part_text_raw_generic_set(Edje *ed, Evas_Object *obj, Edje_Real_Par
else
if (text)
{
if (legacy)
if (legacy || (rp->part->type == EDJE_PART_TYPE_TEXT) || set_markup)
{
rp->typedata.text->text = eina_stringshare_add(text);
}
else if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
else // !legacy && (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
// && !set_markup
{
if (set_markup)
{
rp->typedata.text->text = eina_stringshare_add(text);
}
else
{
char *mkup;
mkup = efl_text_markup_util_text_to_markup(
EFL_TEXT_MARKUP_UTIL_CLASS,
text);
rp->typedata.text->text = eina_stringshare_add(mkup);
free(mkup);
}
char *mkup;
mkup = efl_text_markup_util_text_to_markup(
EFL_TEXT_MARKUP_UTIL_CLASS,
text);
rp->typedata.text->text = eina_stringshare_add(mkup);
free(mkup);
}
}
ed->dirty = EINA_TRUE;