From 2fd5b32bf8e7a0e114ea546d5544d525a977bd89 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Mon, 29 Jan 2018 14:56:02 +0900 Subject: [PATCH] Use efl_text_markup_set/get for elm_layout_text_set/get This patch set has following upstream commit. (1) commit 429e19563d15a02d3417ff8fffca994ce6685249 elm: make elm_layout_text_set use efl_text_markup_set The elm_layout_text_get is using efl_text_markup_get by following commit. commit c07a40c745c5df1b1f6f0bbf666b233d8d072ca7 elm: make elm_object_text_get return markup info as well. This commit solves following issue https://phab.enlightenment.org/T6642 If I set object text as below elm_object_text_set(btn, "Some
text"); then elm_object_text_get(btn) returns "Some text" not "Some
text". So using efl_text_markup_set makes sense. (2) commit c07a40c745c5df1b1f6f0bbf666b233d8d072ca7 elm: make elm_object_text_get return markup info as well. This commit solves following issue https://phab.enlightenment.org/T6642 If I set object text as below elm_object_text_set(btn, "Some
text"); then elm_object_text_get(btn) returns "Some text" not "Some
text". Change-Id: I84ee20c6e30a201c0fbf22d7779ffb9187d1d07e --- src/lib/elementary/efl_ui_layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 165d4e4..bd14c3e 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -2259,7 +2259,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_set(efl_part(obj, part), text); + efl_text_markup_set(efl_part(obj, part), text); return EINA_TRUE; } @@ -2274,7 +2274,7 @@ elm_layout_text_get(const Eo *obj, const char *part) else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE)) return NULL; - return efl_text_get(efl_part(obj, part)); + return efl_text_markup_get(efl_part(obj, part)); } EAPI Eina_Bool -- 2.7.4