pool/gtk4
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1090747 from home:polslinux:branches:GNOME:Factory

Browse Source 
- Add fix-gridview.patch: Add border-spacing where it was missed.
  We were computing column widths without taking border-spacing into
  account, making them slightly too big (glgo#GNOME/nautilus#2980).

OBS-URL: https://build.opensuse.org/request/show/1090747
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=136
This commit is contained in:
Dominique Leuenberger 2023-06-05 14:02:41 +00:00 committed by Git OBS Bridge
parent ad6fe6598a
commit abc5a7e794
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fix-gridview.patch Normal file
View File

@ -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

7
gtk4.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jun 4 12:17:15 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
- Add fix-gridview.patch: Add border-spacing where it was missed.
We were computing column widths without taking border-spacing into
account, making them slightly too big (glgo#GNOME/nautilus#2980).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 4 14:48:30 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com> Thu May 4 14:48:30 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

2
gtk4.spec
View File

@ -50,6 +50,8 @@ Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch
Patch1: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5873.patch#/gtk4-correctly-refresh-after-delete.patch Patch1: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5873.patch#/gtk4-correctly-refresh-after-delete.patch
# PATCH-FIX-UPSTREAM 966a2350.patch glgo#GNOME/gtk#5798 -- css: Don't transition to currentColor # PATCH-FIX-UPSTREAM 966a2350.patch glgo#GNOME/gtk#5798 -- css: Don't transition to currentColor
Patch2: https://gitlab.gnome.org/GNOME/gtk/-/commit/966a2350.patch Patch2: https://gitlab.gnome.org/GNOME/gtk/-/commit/966a2350.patch
# PATCH-FIX-UPSTREAM fix-gridview.patch glgo#GNOME/nautilus#2980 -- Add border-spacing where it was missed
Patch3: fix-gridview.patch
BuildRequires: cups-devel >= 2.0 BuildRequires: cups-devel >= 2.0
# We do not support building against cups 2.3 betas # We do not support building against cups 2.3 betas