vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dummy object: split remove fake objetcts of Spacer and Swallow. 

Fix removing fake objects, that represent deleted parts.
Previous solution wasn't clearing spacer list, and this can
cause undefined behaviour.

Function dummy_objs_update should be optimized. Because in
current state inside this function there are too much loop
with the similar logic.

@fix
This commit is contained in:
Mykyta Biliavskyi 2015-12-22 11:01:11 +09:00
parent 9863ea304c
commit 7d523c5ede
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/dummy_obj.c
View File

@ -56,12 +56,11 @@ dummy_objs_update(dummy_obj *dummy)
EINA_LIST_FOREACH(parts, l2, part_name) EINA_LIST_FOREACH(parts, l2, part_name)
{ {
if (po->name[0] != part_name[0]) continue; if (po->name[0] != part_name[0]) continue;
if (strlen(po->name) != strlen(part_name)) continue; if ((strlen(po->name) != strlen(part_name))) continue;
if (!strcmp(po->name, part_name)) if (!strcmp(po->name, part_name))
{ {
type = edje_edit_part_type_get(dummy->layout, part_name); type = edje_edit_part_type_get(dummy->layout, part_name);
if ((type == EDJE_PART_TYPE_SWALLOW) || if ((type == EDJE_PART_TYPE_SWALLOW))
(type == EDJE_PART_TYPE_SPACER))
removed = EINA_FALSE; removed = EINA_FALSE;
break; break;
} }
@ -70,10 +69,33 @@ dummy_objs_update(dummy_obj *dummy)
{ {
evas_object_del(po->obj); evas_object_del(po->obj);
eina_stringshare_del(po->name); eina_stringshare_del(po->name);
if (type == EDJE_PART_TYPE_SWALLOW) dummy->swallows = eina_list_remove_list(dummy->swallows, l);
dummy->swallows = eina_list_remove_list(dummy->swallows, l); free(po);
else if (type == EDJE_PART_TYPE_SPACER) }
dummy->spacers = eina_list_remove_list(dummy->spacers, l); }
//Remove the fake swallow objects that parts are removed.
EINA_LIST_FOREACH_SAFE(dummy->spacers, l, l_next, po)
{
removed = EINA_TRUE;
EINA_LIST_FOREACH(parts, l2, part_name)
{
if (po->name[0] != part_name[0]) continue;
if ((strlen(po->name) != strlen(part_name))) continue;
if (!strcmp(po->name, part_name))
{
type = edje_edit_part_type_get(dummy->layout, part_name);
if ((type == EDJE_PART_TYPE_SPACER))
removed = EINA_FALSE;
break;
}
}
if (removed)
{
evas_object_del(po->obj);
eina_stringshare_del(po->name);
dummy->spacers = eina_list_remove_list(dummy->spacers, l);
free(po); free(po);
} }
} }