diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2013-10-04 21:41:46 +0200 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-11-20 23:13:19 +0000 |
| commit | e2aed8b5d81511e465d0f279a7a07ceb483a0bf5 (patch) | |
| tree | a127b22ebf008304bfa4c3bd0758bfb7716aeef0 | |
| parent | 202fc7e528d7e8dca248a603f5593fefb400500d (diff) | |
| download | clutter-e2aed8b5d81511e465d0f279a7a07ceb483a0bf5.tar.gz | |
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
(cherry picked from commit 3435d017e27755353123ca8f65bfe3c051102b48)
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
| -rw-r--r-- | clutter/clutter-table-layout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c index 0f5b24171..2c9a28cd2 100644 --- a/clutter/clutter-table-layout.c +++ b/clutter/clutter-table-layout.c @@ -889,8 +889,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) { @@ -1179,8 +1179,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) { |