From 11dbc52d0e6b0151dd4fa09c0d0b00148c544f34 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Mon, 14 Feb 2011 10:49:14 +0000
Subject: [PATCH] Evas textblock: Fixed issue with incorrect sizes in
 textblock, _text_item_update_sizes should be called after merging.

SVN revision: 57012
---
 legacy/evas/src/lib/canvas/evas_object_textblock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 1dd7fa5487..467fedfdb5 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/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;