forked from enlightenment/efl
edje_cc probably should ignore limit inherits when there are no limits
This commit is contained in:
parent
74556a3f90
commit
3083732bfb
|
@ -2860,63 +2860,70 @@ st_collections_group_inherit(void)
|
||||||
pcp2 = (Edje_Part_Collection_Parser *)pc2;
|
pcp2 = (Edje_Part_Collection_Parser *)pc2;
|
||||||
pcp->default_mouse_events = pcp2->default_mouse_events;
|
pcp->default_mouse_events = pcp2->default_mouse_events;
|
||||||
|
|
||||||
{
|
if (pc2->limits.vertical_count || pc2->limits.horizontal_count)
|
||||||
Edje_Limit **elp;
|
{
|
||||||
|
Edje_Limit **elp;
|
||||||
|
|
||||||
elp = realloc(pc->limits.vertical,
|
if (pc2->limits.vertical_count)
|
||||||
pc->limits.vertical_count + pc2->limits.vertical_count * sizeof(Edje_Limit *));
|
{
|
||||||
if (!elp)
|
elp = realloc(pc->limits.vertical,
|
||||||
{
|
pc->limits.vertical_count + pc2->limits.vertical_count * sizeof(Edje_Limit *));
|
||||||
ERR("Not enough memory.");
|
if (!elp)
|
||||||
exit(-1);
|
{
|
||||||
}
|
ERR("Not enough memory.");
|
||||||
pc->limits.vertical = elp;
|
exit(-1);
|
||||||
offset = pc->limits.vertical_count;
|
}
|
||||||
for (i = 0; i < pc2->limits.vertical_count; i++)
|
pc->limits.vertical = elp;
|
||||||
{
|
offset = pc->limits.vertical_count;
|
||||||
Edje_Limit *el;
|
for (i = 0; i < pc2->limits.vertical_count; i++)
|
||||||
|
{
|
||||||
|
Edje_Limit *el;
|
||||||
|
|
||||||
el = mem_alloc(SZ(Edje_Limit));
|
el = mem_alloc(SZ(Edje_Limit));
|
||||||
if (!el)
|
if (!el)
|
||||||
{
|
{
|
||||||
ERR("Not enough memory.");
|
ERR("Not enough memory.");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
pc->limits.vertical[i + offset] = el;
|
pc->limits.vertical[i + offset] = el;
|
||||||
|
|
||||||
el->name = STRDUP(pc2->limits.vertical[i]->name);
|
el->name = STRDUP(pc2->limits.vertical[i]->name);
|
||||||
el->value = pc2->limits.vertical[i]->value;
|
el->value = pc2->limits.vertical[i]->value;
|
||||||
pc->limits.vertical_count++;
|
pc->limits.vertical_count++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
elp = realloc(pc->limits.horizontal,
|
if (pc2->limits.horizontal_count)
|
||||||
pc->limits.horizontal_count + pc2->limits.horizontal_count * sizeof(Edje_Limit *));
|
{
|
||||||
if (!elp)
|
elp = realloc(pc->limits.horizontal,
|
||||||
{
|
pc->limits.horizontal_count + pc2->limits.horizontal_count * sizeof(Edje_Limit *));
|
||||||
ERR("Not enough memory.");
|
if (!elp)
|
||||||
exit(-1);
|
{
|
||||||
}
|
ERR("Not enough memory.");
|
||||||
pc->limits.horizontal = elp;
|
exit(-1);
|
||||||
offset = pc->limits.horizontal_count;
|
}
|
||||||
for (i = 0; i < pc2->limits.horizontal_count; i++)
|
pc->limits.horizontal = elp;
|
||||||
{
|
offset = pc->limits.horizontal_count;
|
||||||
Edje_Limit *el;
|
for (i = 0; i < pc2->limits.horizontal_count; i++)
|
||||||
|
{
|
||||||
|
Edje_Limit *el;
|
||||||
|
|
||||||
el = mem_alloc(SZ(Edje_Limit));
|
el = mem_alloc(SZ(Edje_Limit));
|
||||||
if (!el)
|
if (!el)
|
||||||
{
|
{
|
||||||
ERR("Not enough memory.");
|
ERR("Not enough memory.");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
pc->limits.horizontal[i + offset] = el;
|
pc->limits.horizontal[i + offset] = el;
|
||||||
|
|
||||||
el->name = STRDUP(pc2->limits.horizontal[i]->name);
|
el->name = STRDUP(pc2->limits.horizontal[i]->name);
|
||||||
el->value = pc2->limits.horizontal[i]->value;
|
el->value = pc2->limits.horizontal[i]->value;
|
||||||
pc->limits.horizontal_count++;
|
pc->limits.horizontal_count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
offset = pc->parts_count;
|
offset = pc->parts_count;
|
||||||
for (i = 0 ; i < pc2->parts_count ; i++)
|
for (i = 0 ; i < pc2->parts_count ; i++)
|
||||||
|
|
Loading…
Reference in New Issue