forked from enlightenment/efl
Evas textblock: Fixed issue with incorrect sizes in textblock, _text_item_update_sizes should be called after merging.
SVN revision: 57012
This commit is contained in:
parent
62f763217e
commit
11dbc52d0e
|
@ -2503,12 +2503,12 @@ _layout_item_merge_and_free(Ctxt *c,
|
||||||
{
|
{
|
||||||
Eina_Unicode *tmp;
|
Eina_Unicode *tmp;
|
||||||
size_t len1, len2;
|
size_t len1, len2;
|
||||||
_text_item_update_sizes(c, item1);
|
|
||||||
len1 = item1->parent.text_props.text_len;
|
len1 = item1->parent.text_props.text_len;
|
||||||
len2 = item2->parent.text_props.text_len;
|
len2 = item2->parent.text_props.text_len;
|
||||||
evas_common_text_props_merge(&item1->parent.text_props,
|
evas_common_text_props_merge(&item1->parent.text_props,
|
||||||
&item2->parent.text_props);
|
&item2->parent.text_props);
|
||||||
|
|
||||||
|
_text_item_update_sizes(c, item1);
|
||||||
tmp = realloc(item1->text, (len1 + len2 + 1) * sizeof(Eina_Unicode));
|
tmp = realloc(item1->text, (len1 + len2 + 1) * sizeof(Eina_Unicode));
|
||||||
eina_unicode_strcpy(tmp + len1, item2->text);
|
eina_unicode_strcpy(tmp + len1, item2->text);
|
||||||
item1->text = tmp;
|
item1->text = tmp;
|
||||||
|
|
Loading…
Reference in New Issue