summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-02-01 12:57:43 +0200
committerDaniel Hirt <hirt.danny@gmail.com>2018-02-01 13:48:03 +0200
commita44ae48df811ff2bd085da86db1688c0f387efc4 (patch)
tree05c437a042cc6187cb217bf9391cae4594a2a2af
parent26833b8d2868bc015a04155496138423e61305fd (diff)
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
-rw-r--r--src/lib/elementary/efl_ui_layout.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 6a6c11c5ea..b9ebb6562a 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -1214,6 +1214,10 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char
1214{ 1214{
1215 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 1215 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
1216 1216
1217 if (elm_widget_is_legacy(obj))
1218 {
1219 return edje_object_part_text_get(wd->resize_obj, part);
1220 }
1217 return efl_text_get(efl_part(wd->resize_obj, part)); 1221 return efl_text_get(efl_part(wd->resize_obj, part));
1218} 1222}
1219 1223
@@ -2480,7 +2484,7 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text)
2480 else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) 2484 else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
2481 return EINA_FALSE; 2485 return EINA_FALSE;
2482 2486
2483 efl_text_markup_set(efl_part(obj, part), text); 2487 efl_text_set(efl_part(obj, part), text);
2484 return EINA_TRUE; 2488 return EINA_TRUE;
2485} 2489}
2486 2490