From 7c46b447df5a1e8dca1d6a7f305c4d5c37709e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@redhat.com>
Date: Wed, 23 Nov 2022 15:57:56 +0100
Subject: [PATCH] Fix struts on login screen

Resolves: #2145185
---
 ...t-Initialize-regions-unconditionally.patch | 48 +++++++++++++++++++
 gnome-shell.spec                              |  7 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 0001-layout-Initialize-regions-unconditionally.patch

diff --git a/0001-layout-Initialize-regions-unconditionally.patch b/0001-layout-Initialize-regions-unconditionally.patch
new file mode 100644
index 0000000..751be5d
--- /dev/null
+++ b/0001-layout-Initialize-regions-unconditionally.patch
@@ -0,0 +1,48 @@
+From 5aeb97faee1aba8f6d4cc2c613691a7e2c880ccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 17 Nov 2022 15:21:42 +0100
+Subject: [PATCH] layout: Initialize regions unconditionally
+
+We currently initialize regions in all code paths except for the
+greeter. But while there are no windows on the login screen, the
+work area can still be used for positioning, for example for
+notifications.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2546>
+---
+ js/ui/layout.js | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 70ece6cab..c6712459a 100644
+--- a/js/ui/layout.js
++++ b/js/ui/layout.js
+@@ -649,18 +649,17 @@ var LayoutManager = GObject.registerClass({
+                                               reactive: true });
+         this.addChrome(this._coverPane);
+ 
++        // Force an update of the regions before we scale the UI group to
++        // get the correct allocation for the struts.
++        // Do this even when we don't animate on restart, so that maximized
++        // windows restore to the right size.
++        this._updateRegions();
++
+         if (Meta.is_restart()) {
+-            // On restart, we don't do an animation. Force an update of the
+-            // regions immediately so that maximized windows restore to the
+-            // right size taking struts into account.
+-            this._updateRegions();
++            // On restart, we don't do an animation.
+         } else if (Main.sessionMode.isGreeter) {
+             this.panelBox.translation_y = -this.panelBox.height;
+         } else {
+-            // We need to force an update of the regions now before we scale
+-            // the UI group to get the correct allocation for the struts.
+-            this._updateRegions();
+-
+             this.keyboardBox.hide();
+ 
+             let monitor = this.primaryMonitor;
+-- 
+2.38.1
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 4c92db5..5aac531 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           gnome-shell
 Version:        40.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
@@ -45,6 +45,7 @@ Patch43: restrict-dbus-callers.patch
 Patch44: 0001-Revert-dash-Subtract-vertical-margins-from-availHeig.patch
 Patch45: 0001-status-volume-Hide-sliders-initially.patch
 Patch46: 0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch
+Patch47: 0001-layout-Initialize-regions-unconditionally.patch
 
 %define eds_version 3.33.1
 %define gnome_desktop_version 3.35.91
@@ -263,6 +264,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Wed Nov 23 2022 Florian Müllner <fmuellner@redhat.com> - 40.10-4
+- Fix struts on login screen
+  Resolves: #2145185
+
 * Mon Jun 20 2022 Florian Müllner <fmuellner@redhat.com> - 40.10-3
 - Fix keyboard a11y confirmation dialog
   Resolves: #2047644