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

fix table to handle weighting correctly for expands vs not expands. if 

ANY elemtn that spans a col or row CANt expand that column or row is
VETOED frome xpanding, as opposed to the inverse



SVN revision: 59687
This commit is contained in:
Carsten Haitzler 2011-05-26 05:40:47 +00:00
parent 01cbefe2ae
commit f304bf6941
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/evas/src/lib/canvas/evas_object_table.c
View File

@ -521,8 +521,10 @@ _evas_object_table_count_expands(const Eina_Bool *expands, int start, int end)
int count = 0;
for (; itr < itr_end; itr++)
if (*itr)
count++;
{
if (*itr)
count++;
}
return count;
}
@ -598,6 +600,8 @@ _evas_object_table_calculate_hints_regular(Evas_Object *o, Evas_Object_Table_Dat
_evas_object_table_cache_reset(priv);
/* cache interesting data */
memset(c->expands.h, 1, priv->size.cols);
memset(c->expands.v, 1, priv->size.rows);
EINA_LIST_FOREACH(priv->children, l, opt)
{
Evas_Object *child = opt->obj;
@ -635,10 +639,10 @@ _evas_object_table_calculate_hints_regular(Evas_Object *o, Evas_Object_Table_Dat
opt->fill_v = 1;
}
if (opt->expand_h)
memset(c->expands.h + opt->col, 1, opt->colspan);
if (opt->expand_v)
memset(c->expands.v + opt->row, 1, opt->rowspan);
if (!opt->expand_h)
memset(c->expands.h + opt->col, 0, opt->colspan);
if (!opt->expand_v)
memset(c->expands.v + opt->row, 0, opt->rowspan);
}
/* calculate sizes for each row and column */