From 9a16a83c95b95f5ee2fef16a12e135d4e8ce6c48 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 25 Oct 2011 23:18:21 -0400 Subject: [PATCH] Fix gtk_grid_attach_next_to The function did not behave as intended when @sibling is NULL. Also add an example to the docs to clarify the intended behaviour. --- gtk/gtkgrid.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index f6ec2f1111..a122ad4441 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -1465,6 +1465,9 @@ gtk_grid_attach (GtkGrid *grid, * @side. When @sibling is %NULL, the widget is placed in row (for * left or right placement) or column 0 (for top or bottom placement), * at the end indicated by @side. + * + * Attaching widgets labeled [1], [2], [3] with @sibling == %NULL and + * @side == %GTK_POS_LEFT yields a layout of [3][2][1]. */ void gtk_grid_attach_next_to (GtkGrid *grid, @@ -1515,20 +1518,22 @@ gtk_grid_attach_next_to (GtkGrid *grid, switch (side) { case GTK_POS_LEFT: - left = find_attach_position (grid, GTK_ORIENTATION_HORIZONTAL, 0, height, TRUE); + left = find_attach_position (grid, GTK_ORIENTATION_HORIZONTAL, 0, height, FALSE); + left -= width; top = 0; break; case GTK_POS_RIGHT: - left = find_attach_position (grid, GTK_ORIENTATION_HORIZONTAL, 0, height, FALSE); + left = find_attach_position (grid, GTK_ORIENTATION_HORIZONTAL, 0, height, TRUE); top = 0; break; case GTK_POS_TOP: left = 0; - top = find_attach_position (grid, GTK_ORIENTATION_VERTICAL, 0, width, TRUE); + top = find_attach_position (grid, GTK_ORIENTATION_VERTICAL, 0, width, FALSE); + top -= height; break; case GTK_POS_BOTTOM: left = 0; - top = find_attach_position (grid, GTK_ORIENTATION_VERTICAL, 0, width, FALSE); + top = find_attach_position (grid, GTK_ORIENTATION_VERTICAL, 0, width, TRUE); break; default: g_assert_not_reached ();