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

Canvas layout: fix legacy text set 

Keep the legacy code path when using edje_object_part_text_set.
Fixes e's notification that got broken after
3642b3ae67.

Also, limit new efl_text_markup set to TEXTBLOCK parts.
This commit is contained in:
Daniel Hirt 2017-10-01 11:37:42 +03:00
parent a37e1e479d
commit af1595fd01
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1861,7 +1861,7 @@ _edje_object_part_text_raw_generic_set(Edje *ed, Evas_Object *obj, Edje_Real_Par
else
if (text)
{
if (set_markup)
if (set_markup && (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK))
{
char *mkup;
mkup =
@ -6134,7 +6134,7 @@ edje_object_part_swallow_get(const Edje_Object *obj, const char *part)
EAPI Eina_Bool
edje_object_part_text_set(const Edje_Object *obj, const char *part, const char *text)
{
efl_text_markup_set(efl_part(obj, part), text);
efl_text_set(efl_part(obj, part), text);
return EINA_TRUE;
}