tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=675a263f97a9766640eea7b5c4dab9850c817949
commit 675a263f97a9766640eea7b5c4dab9850c817949
Author: Tom Hacohen <t...@stosb.com>
Date: Fri Feb 26 09:07:20 2016 +0000
Edje textblock: Assume textblock knows to deal with setting the same markup.
Edje was trying to be smart and ask textblock for its markup and compare
with its own cache before setting it again. This is completely wrong,
and textblock is smart enough to deal with it now.
@fix
---
src/lib/edje/edje_calc.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index a36a80e..ea416c9 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1564,8 +1564,6 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
if (stl)
{
- const char *ptxt;
-
if (evas_object_textblock_style_get(ep->object) != stl->style)
evas_object_textblock_style_set(ep->object, stl->style);
// FIXME: need to account for editing
@@ -1575,11 +1573,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
}
else
{
- ptxt = evas_object_textblock_text_markup_get(ep->object);
- if (((!ptxt) && (text)) ||
- ((ptxt) && (text) && (strcmp(ptxt, text))) ||
- ((ptxt) && (!text)))
- evas_object_textblock_text_markup_set(ep->object, text);
+ evas_object_textblock_text_markup_set(ep->object, text);
}
if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
{
--
