herdsman pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=6033323e5cd0a248bd9830c970b546f2ac8dfebb

commit 6033323e5cd0a248bd9830c970b546f2ac8dfebb
Author: Daniel Hirt <hirt.da...@gmail.com>
Date:   Sun Jun 18 10:13:05 2017 +0300

    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.
---
 src/lib/evas/canvas/evas_object_textblock.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index 268f9e33a9..2d8f7887f3 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -3437,7 +3437,7 @@ _layout_format_pop(Ctxt *c, const char *format)
                    * I.e whole of the ending tag matches the start of the
                    * starting tag, and the starting tag's next char is either
                    * 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))
                     {
                        _format_unref_free(c->obj, fmt);
@@ -3445,7 +3445,7 @@ _layout_format_pop(Ctxt *c, const char *format)
                     }
                   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);
                     }
                }
@@ -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))
           {
-             c->fmt = _layout_format_push(c, NULL, NULL);
              _format_fill(c->obj, c->fmt, c->o->style->default_tag);
              finalize = EINA_TRUE;
           }

-- 


Reply via email to