From 3462390b5cda12ca0b37cf00a2a20a5d3636d4b5 Mon Sep 17 00:00:00 2001 From: Daniel Hirt Date: Sun, 1 Oct 2017 18:40:50 +0300 Subject: [PATCH] Ui layout: handle Efl.Text legacy code better This should cover the cases without need to duplicate a lot of code. Follow-up to deca3c947ff1a2bed3f4baadce576105055af266. --- src/lib/elementary/efl_ui_layout.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 37fe34d29f..d091b0500b 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -1255,17 +1255,19 @@ _efl_ui_layout_text_generic_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *par if (!text) return EINA_TRUE; - if (is_markup) + if (wd->legacy) { if (!edje_object_part_text_escaped_set (wd->resize_obj, part, text)) return EINA_FALSE; } + else if (is_markup) + { + efl_text_markup_set(efl_part(wd->resize_obj, part), text); + } else { - if (!edje_object_part_text_unescaped_set - (wd->resize_obj, part, text)) - return EINA_FALSE; + efl_text_set(efl_part(wd->resize_obj, part), text); } if (!sub_d)