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

edje_cc probably should ignore limit inherits when there are no limits

This commit is contained in:
Mike Blumenkrantz 2014-03-25 11:06:06 -04:00
parent 74556a3f90
commit 3083732bfb
1 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/edje/edje_cc_handlers.c
View File

@ -2860,9 +2860,12 @@ st_collections_group_inherit(void)
pcp2 = (Edje_Part_Collection_Parser *)pc2;
pcp->default_mouse_events = pcp2->default_mouse_events;
if (pc2->limits.vertical_count || pc2->limits.horizontal_count)
{
Edje_Limit **elp;
if (pc2->limits.vertical_count)
{
elp = realloc(pc->limits.vertical,
pc->limits.vertical_count + pc2->limits.vertical_count * sizeof(Edje_Limit *));
if (!elp)
@ -2889,7 +2892,10 @@ st_collections_group_inherit(void)
el->value = pc2->limits.vertical[i]->value;
pc->limits.vertical_count++;
}
}
if (pc2->limits.horizontal_count)
{
elp = realloc(pc->limits.horizontal,
pc->limits.horizontal_count + pc2->limits.horizontal_count * sizeof(Edje_Limit *));
if (!elp)
@ -2917,6 +2923,7 @@ st_collections_group_inherit(void)
pc->limits.horizontal_count++;
}
}
}
offset = pc->parts_count;
for (i = 0 ; i < pc2->parts_count ; i++)