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

Ui layout: fix latest attempt to fix markup retreival 

Commits c07a40c745 and
429e19563d tried to fix markup retrieval by
creating a different code path for the setter and getter. However, legacy code
paths needs to be taken into consideration.
This commit fixes legacy widgets (like guide text that did not show any text
        in the entry at the top of 'elementary_test').

ref T6642
This commit is contained in:
Daniel Hirt 2018-02-01 12:57:43 +02:00
parent 26833b8d28
commit a44ae48df8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/efl_ui_layout.c
View File

@ -1214,6 +1214,10 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
if (elm_widget_is_legacy(obj))
{
return edje_object_part_text_get(wd->resize_obj, part);
}
return efl_text_get(efl_part(wd->resize_obj, part));
}
@ -2480,7 +2484,7 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text)
else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
return EINA_FALSE;
efl_text_markup_set(efl_part(obj, part), text);
efl_text_set(efl_part(obj, part), text);
return EINA_TRUE;
}