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

evas table: CRI when attempting to pack a table child into another table 

@fix
This commit is contained in:
Mike Blumenkrantz 2017-03-17 13:16:53 -04:00
parent f6434c0e0d
commit b86362dd05
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/evas/canvas/evas_object_table.c
View File

@ -1133,7 +1133,15 @@ _evas_table_pack(Eo *o, Evas_Table_Data *priv, Evas_Object *child, unsigned shor
}
opt = _evas_object_table_option_get(child);
if (!opt)
if (opt)
{
if (evas_object_smart_parent_get(child) != o)
{
CRI("cannot pack child of one table into another table!");
return EINA_FALSE;
}
}
else
{
opt = malloc(sizeof(*opt));
if (!opt)
@ -1152,7 +1160,7 @@ _evas_table_pack(Eo *o, Evas_Table_Data *priv, Evas_Object *child, unsigned shor
opt->end_col = col + colspan;
opt->end_row = row + rowspan;
if (evas_object_smart_parent_get(child) == o)
if (!optalloc)
{
Eina_Bool need_shrink = EINA_FALSE;