enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje: fix reapplying markup text on file/group change 

Summary:
this was being stored as regular text when it was actually markup

@fix

Depends on D9208

Reviewers: cedric

Reviewed By: cedric

Subscribers: #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D9209
This commit is contained in:
Mike Blumenkrantz 2019-07-10 14:24:51 -04:00
parent aa921c553b
commit 66213df2f5
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/edje/edje_load.c
View File

@ -1683,7 +1683,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
switch (eud->u.string.type)
{
case EDJE_TEXT_TYPE_NORMAL:
edje_object_part_text_set(obj, eud->part, eud->u.string.text);
efl_text_set(efl_part(obj, eud->part), eud->u.string.text);
break;
case EDJE_TEXT_TYPE_MARKUP:
efl_text_markup_set(efl_part(obj, eud->part), eud->u.string.text);
break;
case EDJE_TEXT_TYPE_ESCAPED:
edje_object_part_text_escaped_set(obj, eud->part, eud->u.string.text);

1
src/lib/edje/edje_private.h
View File

@ -2085,6 +2085,7 @@ struct _Edje_Signal_Callback
typedef enum
{
EDJE_TEXT_TYPE_NORMAL,
EDJE_TEXT_TYPE_MARKUP,
EDJE_TEXT_TYPE_ESCAPED,
EDJE_TEXT_TYPE_UNESCAPED
} Edje_Text_Type;

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

@ -2114,7 +2114,8 @@ _edje_efl_text_text_set(Eo *obj, Edje *ed, const char *part, const char *text,
}
int_ret = _edje_object_part_text_raw_generic_set(ed, obj, rp, part, text,
set_markup, legacy);
_edje_user_define_string(ed, part, rp->typedata.text->text, EDJE_TEXT_TYPE_NORMAL);
_edje_user_define_string(ed, part, rp->typedata.text->text,
set_markup ? EDJE_TEXT_TYPE_MARKUP : EDJE_TEXT_TYPE_NORMAL);
return int_ret;
}