diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-08-30 15:11:02 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-09-05 18:56:23 +0200 |
| commit | d717a2dcfc8603561f8a0f78982244e8b8fd9006 (patch) | |
| tree | be123eb9c1c35f79929a8ab5d06a1923e3ccd9d7 /gtk/gtkgrid.c | |
| parent | b314f03bf4d96e71eb1385db40959c610dbd1c7d (diff) | |
| download | gtk+-d717a2dcfc8603561f8a0f78982244e8b8fd9006.tar.gz | |
grid: Swap wrong spacing properties
row-spacing behaved like column-spacing should have and vice versa.
Also update tests that erroneously checked this behavior.
Thanks to Joanmarie Diggs for finding this.
Diffstat (limited to 'gtk/gtkgrid.c')
| -rw-r--r-- | gtk/gtkgrid.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index df6d74daec..f6ec2f1111 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -163,11 +163,11 @@ gtk_grid_get_property (GObject *object, break; case PROP_ROW_SPACING: - g_value_set_int (value, ROWS (priv)->spacing); + g_value_set_int (value, COLUMNS (priv)->spacing); break; case PROP_COLUMN_SPACING: - g_value_set_int (value, COLUMNS (priv)->spacing); + g_value_set_int (value, ROWS (priv)->spacing); break; case PROP_ROW_HOMOGENEOUS: @@ -1821,9 +1821,9 @@ gtk_grid_set_row_spacing (GtkGrid *grid, priv = grid->priv; - if (ROWS (priv)->spacing != spacing) + if (COLUMNS (priv)->spacing != spacing) { - ROWS (priv)->spacing = spacing; + COLUMNS (priv)->spacing = spacing; if (gtk_widget_get_visible (GTK_WIDGET (grid))) gtk_widget_queue_resize (GTK_WIDGET (grid)); @@ -1848,7 +1848,7 @@ gtk_grid_get_row_spacing (GtkGrid *grid) priv = grid->priv; - return ROWS (priv)->spacing; + return COLUMNS (priv)->spacing; } /** @@ -1868,9 +1868,9 @@ gtk_grid_set_column_spacing (GtkGrid *grid, priv = grid->priv; - if (COLUMNS (priv)->spacing != spacing) + if (ROWS (priv)->spacing != spacing) { - COLUMNS (priv)->spacing = spacing; + ROWS (priv)->spacing = spacing; if (gtk_widget_get_visible (GTK_WIDGET (grid))) gtk_widget_queue_resize (GTK_WIDGET (grid)); @@ -1896,5 +1896,5 @@ gtk_grid_get_column_spacing (GtkGrid *grid) priv = grid->priv; - return COLUMNS (priv)->spacing; + return ROWS (priv)->spacing; } |