From a9583370ae9780b31ee78a8a9f22e0771c46fe3b Mon Sep 17 00:00:00 2001 From: Youngbok Shin Date: Fri, 9 Feb 2018 18:11:15 +0900 Subject: [PATCH] Ui layout: fix latest attempt to fix markup retreival Commits c07a40c745c5df1b1f6f0bbf666b233d8d072ca7 and 429e19563d15a02d3417ff8fffca994ce6685249 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 Change-Id: I65d0433a75ff9e4e11d45eb46b18163a13aa98bc --- src/lib/elementary/efl_ui_layout.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index bd14c3e..a96d280 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -1222,6 +1222,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)); } @@ -2259,7 +2263,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; } -- 2.7.4