summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Kuehne <andre.kuehne.77@gmail.com>2012-07-18 20:57:00 +0200
committerEmmanuele Bassi <ebassi@gnome.org>2012-08-27 16:23:34 +0100
commitd332255111cb763542252a0ba9af249407b63287 (patch)
tree78de40feb9f941659d3cffab4e35735acb8d7b09
parent59801ef854016cc85c6bcf8b6ed8a77081f433fb (diff)
downloadclutter-d332255111cb763542252a0ba9af249407b63287.tar.gz
Fix clutter_table_layout_pack row/column count incrementation.
When appending (with a negative row/column parameter), the row/column count should be incremented by 1, not 2. This also fixes layout errors when using column/row spacing: The amount of extra space required was calculated incorrectly due to the wrong column count. https://bugzilla.gnome.org/show_bug.cgi?id=679990
-rw-r--r--clutter/clutter-table-layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index 44729022a..9927ad59a 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -1905,10 +1905,10 @@ clutter_table_layout_pack (ClutterTableLayout *layout,
g_assert (CLUTTER_IS_TABLE_CHILD (meta));
if (row < 0)
- row = priv->n_rows + 1;
+ row = priv->n_rows;
if (column < 0)
- column = priv->n_cols + 1;
+ column = priv->n_cols;
table_child_set_position (CLUTTER_TABLE_CHILD (meta), column, row);
}