forked from enlightenment/efl
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
This commit is contained in:
parent
34020ed131
commit
675a263f97
|
@ -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))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue