gtk4 rebuild

This commit is contained in:
Rmys
2023-06-03 17:48:17 +03:00
parent b1e49c0416
commit d15948574f
2 changed files with 44 additions and 0 deletions
@@ -0,0 +1,36 @@
From 099955b0c06dbddc9469bd3c8e63673a3a82883f Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 16 May 2023 18:08:21 +0200
Subject: [PATCH] gridview: Add border-spacing where it was missed
We were computing column widths without taking border-spacing into
account, making them slightly too big.
---
gtk/gtkgridview.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index 274f34c3c95..885826a138e 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 */
--
GitLab
+8
View File
@@ -58,6 +58,7 @@
<Patch level="1">4f476837.diff</Patch>
<Patch level="1">541de345.diff</Patch>
<Patch level="1">b686ce1c.diff</Patch>
<Patch level="1">099955b0.patch</Patch>
</Patches>
</Source>
@@ -199,6 +200,13 @@
</Package>
<History>
<Update release="19">
<Date>2023-06-03</Date>
<Version>4.10.3</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2023-05-30</Date>
<Version>4.10.3</Version>