From: tasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 14 Feb 2011 10:49:14 +0000 (+0000)
Subject: Evas textblock: Fixed issue with incorrect sizes in textblock, _text_item_update_size... 
X-Git-Tag: 2.0_alpha~240^2~1028
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72b9f4875341653d5abd56cf1b8cebc2075f9377;p=framework%2Fuifw%2Fevas.git

Evas textblock: Fixed issue with incorrect sizes in textblock, _text_item_update_sizes should be called after merging.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@57012 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 1dd7fa5..467fedf 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -2503,12 +2503,12 @@ _layout_item_merge_and_free(Ctxt *c,
 {
    Eina_Unicode *tmp;
    size_t len1, len2;
-   _text_item_update_sizes(c, item1);
    len1 = item1->parent.text_props.text_len;
    len2 = item2->parent.text_props.text_len;
    evas_common_text_props_merge(&item1->parent.text_props,
          &item2->parent.text_props);
 
+   _text_item_update_sizes(c, item1);
    tmp = realloc(item1->text, (len1 + len2 + 1) * sizeof(Eina_Unicode));
    eina_unicode_strcpy(tmp + len1, item2->text);
    item1->text = tmp;