summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2023-05-16 18:08:21 +0200
committerBenjamin Otte <otte@redhat.com>2023-05-16 18:53:09 +0200
commit099955b0c06dbddc9469bd3c8e63673a3a82883f (patch)
tree5ed1888e0193c4e2df8083377a2cf47dfd1a0cc4
parentb530ade8c6eb6673f8ccd543616c89b609b747d8 (diff)
downloadgtk+-099955b0c06dbddc9469bd3c8e63673a3a82883f.tar.gz
gridview: Add border-spacing where it was missed
We were computing column widths without taking border-spacing into account, making them slightly too big.
-rw-r--r--gtk/gtkgridview.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index 274f34c3c9..885826a138 100644
--- a/gtk/gtkgridview.c
+++ b/gtk/gtkgridview.c
@@ -657,7 +657,7 @@ gtk_grid_view_measure_list (GtkWidget *widget,
gtk_grid_view_measure_column_size (self, &col_min, &col_nat);
for_size = MAX (for_size, col_min * (int) self->min_columns);
n_columns = gtk_grid_view_compute_n_columns (self, for_size, xspacing, col_min, col_nat);
- column_size = for_size / n_columns;
+ column_size = (for_size + xspacing) / n_columns - xspacing;
i = 0;
row_height = 0;
@@ -770,7 +770,7 @@ gtk_grid_view_size_allocate (GtkWidget *widget,
orientation == GTK_ORIENTATION_VERTICAL ? width : height,
xspacing,
col_min, col_nat);
- self->column_width = (orientation == GTK_ORIENTATION_VERTICAL ? width : height) / self->n_columns;
+ self->column_width = ((orientation == GTK_ORIENTATION_VERTICAL ? width : height) + xspacing) / self->n_columns - xspacing;
self->column_width = MAX (self->column_width, col_min);
/* step 2: determine height of known rows */