table-layout: Base space calculations on visible children

This is what we already do in the actual size requests, it makes
sense to do the same in the space calculations.

https://bugzilla.gnome.org/show_bug.cgi?id=709434
This commit is contained in:
Florian Müllner 2013-10-04 21:41:46 +02:00
parent 44b1a808c8
commit 3435d017e2

View File

@ -883,8 +883,8 @@ calculate_col_widths (ClutterTableLayout *self,
n_expand++;
}
pref_width += priv->col_spacing * (priv->n_cols - 1);
min_width += priv->col_spacing * (priv->n_cols - 1);
pref_width += priv->col_spacing * MAX (priv->visible_cols - 1, 0);
min_width += priv->col_spacing * MAX (priv->visible_cols - 1, 0);
if (for_width <= min_width)
{
@ -1173,8 +1173,8 @@ calculate_row_heights (ClutterTableLayout *self,
n_expand++;
}
pref_height += priv->row_spacing * (priv->n_rows - 1);
min_height += priv->row_spacing * (priv->n_rows - 1);
pref_height += priv->row_spacing * MAX (priv->visible_rows - 1, 0);
min_height += priv->row_spacing * MAX (priv->visible_rows - 1, 0);
if (for_height <= min_height)
{