From b447d582827c59f2893688ae13a507fe64a68273 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 18 2022 20:17:27 +0000
Subject: import gnome-control-center-3.28.2-32.el8


---

diff --git a/SOURCES/0001-displays-Don-t-enlarge-display-panel-artificially.patch b/SOURCES/0001-displays-Don-t-enlarge-display-panel-artificially.patch
new file mode 100644
index 0000000..6f4cda7
--- /dev/null
+++ b/SOURCES/0001-displays-Don-t-enlarge-display-panel-artificially.patch
@@ -0,0 +1,41 @@
+From 228857e1f4513c513ca5252b780656d8d8952632 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed, 9 Jun 2021 16:51:10 +0200
+Subject: [PATCH] displays: Don't enlarge display panel artificially
+
+Don't set a size group on the main box, and don't let the padding
+boxes expand, either. This makes the display panel able to fit
+again in a 800x600 resolution.
+---
+ panels/display/cc-display-panel.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index 0b4fa193d..0e7dc131e 100644
+--- a/panels/display/cc-display-panel.c
++++ b/panels/display/cc-display-panel.c
+@@ -541,9 +541,9 @@ static GtkWidget *
+ wrap_in_boxes (GtkWidget *widget)
+ {
+   GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, PANEL_PADDING);
+-  gtk_box_pack_start (GTK_BOX (box), make_bin(), TRUE, TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (box), make_bin(), FALSE, FALSE, 0);
+   gtk_box_pack_start (GTK_BOX (box), widget, TRUE, TRUE, 0);
+-  gtk_box_pack_start (GTK_BOX (box), make_bin(), TRUE, TRUE, 0);
++  gtk_box_pack_start (GTK_BOX (box), make_bin(), FALSE, FALSE, 0);
+   return box;
+ }
+ 
+@@ -586,9 +586,6 @@ make_main_vbox (GtkSizeGroup *size_group)
+   gtk_widget_set_margin_top (vbox, PANEL_PADDING);
+   gtk_widget_set_margin_bottom (vbox, PANEL_PADDING);
+ 
+-  if (size_group)
+-    gtk_size_group_add_widget (size_group, vbox);
+-
+   return vbox;
+ }
+ 
+-- 
+2.32.0.rc1
+
diff --git a/SPECS/gnome-control-center.spec b/SPECS/gnome-control-center.spec
index ec1a7e4..aa07184 100644
--- a/SPECS/gnome-control-center.spec
+++ b/SPECS/gnome-control-center.spec
@@ -11,7 +11,7 @@
 
 Name:           gnome-control-center
 Version:        3.28.2
-Release:        31%{?dist}
+Release:        32%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -79,6 +79,8 @@ Patch38:        0008-network-Fix-saving-passwords-for-non-wifi-connection.patch
 # Backport monitor config policy (#2001655)
 Patch39:        0001-display-Only-display-configuration-options-if-apply-.patch
 
+Patch40:        0001-displays-Don-t-enlarge-display-panel-artificially.patch
+
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -251,6 +253,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Thu Feb 10 2022 Carlos Garnacho <cgarnach@redhat.com> - 3.28.2-32
+- Make displays panel able to fit in 800x600 resolution
+  Resolves: #1893650
+
 * Fri Feb 04 2022 Jonas Ådahl <jadahl@redhat.com> - 3.28.3-31
 - Backport monitor config policy
   Resolves: #2001655