summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2017-10-01 18:40:50 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2017-10-01 19:51:28 +0300
commit3462390b5cda12ca0b37cf00a2a20a5d3636d4b5 (patch)
treebf6da36fd09dd4d580788737f4aa36ac6fc1d096 /src/lib
parent0061a4bb349e6c8e122913791bf83f7f40b0cede (diff)
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.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_ui_layout.c10
1 files 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
1255 1255
1256 if (!text) return EINA_TRUE; 1256 if (!text) return EINA_TRUE;
1257 1257
1258 if (is_markup) 1258 if (wd->legacy)
1259 { 1259 {
1260 if (!edje_object_part_text_escaped_set 1260 if (!edje_object_part_text_escaped_set
1261 (wd->resize_obj, part, text)) 1261 (wd->resize_obj, part, text))
1262 return EINA_FALSE; 1262 return EINA_FALSE;
1263 } 1263 }
1264 else if (is_markup)
1265 {
1266 efl_text_markup_set(efl_part(wd->resize_obj, part), text);
1267 }
1264 else 1268 else
1265 { 1269 {
1266 if (!edje_object_part_text_unescaped_set 1270 efl_text_set(efl_part(wd->resize_obj, part), text);
1267 (wd->resize_obj, part, text))
1268 return EINA_FALSE;
1269 } 1271 }
1270 1272
1271 if (!sub_d) 1273 if (!sub_d)