forked from enlightenment/efl
evas: table - when colspan(rowspan) is over 2, padding size should be added.
@ fix
This commit is contained in:
parent
83db6524ba
commit
ad8daa2f84
|
@ -489,8 +489,10 @@ _evas_object_table_calculate_layout_homogeneous(Evas_Object *o, Evas_Table_Data
|
||||||
|
|
||||||
cx = x + ((opt->col * ww) / priv->size.cols);
|
cx = x + ((opt->col * ww) / priv->size.cols);
|
||||||
cw = x + (((opt->col + opt->colspan) * ww) / priv->size.cols) - cx;
|
cw = x + (((opt->col + opt->colspan) * ww) / priv->size.cols) - cx;
|
||||||
|
cw += (opt->colspan - 1) * priv->pad.v;
|
||||||
cy = y + ((opt->row * hh) / priv->size.rows);
|
cy = y + ((opt->row * hh) / priv->size.rows);
|
||||||
ch = y + (((opt->row + opt->rowspan) * hh) / priv->size.rows) - cy;
|
ch = y + (((opt->row + opt->rowspan) * hh) / priv->size.rows) - cy;
|
||||||
|
ch += (opt->rowspan - 1) * priv->pad.h;
|
||||||
|
|
||||||
cx += (opt->col) * priv->pad.h;
|
cx += (opt->col) * priv->pad.h;
|
||||||
cy += (opt->row) * priv->pad.v;
|
cy += (opt->row) * priv->pad.v;
|
||||||
|
|
Loading…
Reference in New Issue