timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Canvas text: fix default format feature 

Now that we can set the default parameters, there's no need to push
another one when having a style tag.

This fixes T5585.
This commit is contained in:
Daniel Hirt 2017-06-18 10:13:05 +03:00
parent d6140f3854
commit 6033323e5c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -3437,7 +3437,7 @@ _layout_format_pop(Ctxt *c, const char *format)
* I.e whole of the ending tag matches the start of the * I.e whole of the ending tag matches the start of the
* starting tag, and the starting tag's next char is either * starting tag, and the starting tag's next char is either
* NULL or white. Skip the starting '+'. */ * NULL or white. Skip the starting '+'. */
if (fmt->fnode && _FORMAT_IS_CLOSER_OF( if (_FORMAT_IS_CLOSER_OF(
fmt->fnode->orig_format, format + 1, len - 1)) fmt->fnode->orig_format, format + 1, len - 1))
{ {
_format_unref_free(c->obj, fmt); _format_unref_free(c->obj, fmt);
@ -3445,7 +3445,7 @@ _layout_format_pop(Ctxt *c, const char *format)
} }
else else
{ {
if (fmt->fnode) redo_nodes = eina_list_prepend(redo_nodes, fmt->fnode); redo_nodes = eina_list_prepend(redo_nodes, fmt->fnode);
_format_unref_free(c->obj, fmt); _format_unref_free(c->obj, fmt);
} }
} }
@ -6359,7 +6359,6 @@ _layout(const Evas_Object *eo_obj, int w, int h, int *w_ret, int *h_ret)
} }
if ((c->o->style) && (c->o->style->default_tag)) if ((c->o->style) && (c->o->style->default_tag))
{ {
c->fmt = _layout_format_push(c, NULL, NULL);
_format_fill(c->obj, c->fmt, c->o->style->default_tag); _format_fill(c->obj, c->fmt, c->o->style->default_tag);
finalize = EINA_TRUE; finalize = EINA_TRUE;
} }