forked from enlightenment/efl
don't free color class stuff in text_on_del, it gets done in color_class_on_del...
also, it seems as though default descriptions at least are shared between objects of the same group, so when this set the color_class to NULL, all other objects lost their colors. SVN revision: 20098
This commit is contained in:
parent
adb75e5097
commit
803562a836
|
@ -67,14 +67,7 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
|
||||||
evas_stringshare_del(pt->default_desc->text.text_class);
|
evas_stringshare_del(pt->default_desc->text.text_class);
|
||||||
pt->default_desc->text.text_class = NULL;
|
pt->default_desc->text.text_class = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pt->default_desc && pt->default_desc->color_class)
|
|
||||||
{
|
|
||||||
_edje_color_class_member_del(ed, pt->default_desc->color_class);
|
|
||||||
evas_stringshare_del(pt->default_desc->color_class);
|
|
||||||
pt->default_desc->color_class = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (tmp = pt->other_desc; tmp; tmp = tmp->next)
|
for (tmp = pt->other_desc; tmp; tmp = tmp->next)
|
||||||
{
|
{
|
||||||
Edje_Part_Description *desc;
|
Edje_Part_Description *desc;
|
||||||
|
@ -86,13 +79,6 @@ _edje_text_part_on_del(Edje *ed, Edje_Part *pt)
|
||||||
evas_stringshare_del(desc->text.text_class);
|
evas_stringshare_del(desc->text.text_class);
|
||||||
desc->text.text_class = NULL;
|
desc->text.text_class = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (desc->color_class)
|
|
||||||
{
|
|
||||||
_edje_color_class_member_del(ed, desc->color_class);
|
|
||||||
evas_stringshare_del(desc->color_class);
|
|
||||||
desc->color_class = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue