From: Daniel Hirt <hirt.danny@gmail.com>
Date: Sun, 18 Jun 2017 07:13:05 +0000 (+0300)
Subject: Canvas text: fix default format feature
X-Git-Tag: upstream/1.20.0~493
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6033323e5cd0a248bd9830c970b546f2ac8dfebb;p=platform%2Fupstream%2Fefl.git

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.
---

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 268f9e3..2d8f788 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;
           }