edje: correct order of functions
Summary: _edje_object_part_text_raw_set() has to locate before _edje_user_define_string(). - _edje_user_define_string takes one of its parameters rp->typedata.text->text, and this is set by _edje_object_part_text_raw_set(). Signed-off-by: Sung-Taek Hong <sth253.hong@samsung.com> Reviewers: cedric, seoz Subscribers: seoz, cedric Differential Revision: https://phab.enlightenment.org/D2118
This commit is contained in:
parent
7b6f4820bc
commit
54b233690d
|
@ -1247,6 +1247,7 @@ EOLIAN Eina_Bool
|
||||||
_edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text)
|
_edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text)
|
||||||
{
|
{
|
||||||
Edje_Real_Part *rp;
|
Edje_Real_Part *rp;
|
||||||
|
Eina_Bool int_ret;
|
||||||
|
|
||||||
if ((!ed) || (!part)) return EINA_FALSE;
|
if ((!ed) || (!part)) return EINA_FALSE;
|
||||||
rp = _edje_real_part_recursive_get(&ed, part);
|
rp = _edje_real_part_recursive_get(&ed, part);
|
||||||
|
@ -1258,8 +1259,9 @@ _edje_object_part_text_set(Eo *obj, Edje *ed, const char *part, const char *text
|
||||||
{
|
{
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
int_ret = _edje_object_part_text_raw_set(ed, obj, rp, part, text);
|
||||||
_edje_user_define_string(ed, part, rp->typedata.text->text);
|
_edje_user_define_string(ed, part, rp->typedata.text->text);
|
||||||
return _edje_object_part_text_raw_set(ed, obj, rp, part, text);
|
return int_ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN const char*
|
EOLIAN const char*
|
||||||
|
|
Loading…
Reference in New Issue