From a8f30b4604ee6113c985ff7df173e258115fd810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 30 Mar 2022 19:34:15 +0200 Subject: [PATCH] Fix warning on restacking Resolves: #2053638 --- ...eAnimation-Fix-warning-on-restacking.patch | 37 +++++++++++++++++++ gnome-shell.spec | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 0001-workspaceAnimation-Fix-warning-on-restacking.patch diff --git a/0001-workspaceAnimation-Fix-warning-on-restacking.patch b/0001-workspaceAnimation-Fix-warning-on-restacking.patch new file mode 100644 index 0000000..e934eed --- /dev/null +++ b/0001-workspaceAnimation-Fix-warning-on-restacking.patch @@ -0,0 +1,37 @@ +From a8b8bff8a9d32b5c80dd2fdd1f7cbe7615835b76 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Tue, 22 Feb 2022 21:16:52 +0100 +Subject: [PATCH] workspaceAnimation: Fix warning on restacking + +Only workspace groups that are associated with a workspace have a +background. As a result, when restacking window previews we end up +passing `undefined` to clutter_actor_set_child_above_sibling() +instead of null, triggering a warning. + +Part-of: +--- + js/ui/workspaceAnimation.js | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/js/ui/workspaceAnimation.js b/js/ui/workspaceAnimation.js +index d240fe156..1731e4027 100644 +--- a/js/ui/workspaceAnimation.js ++++ b/js/ui/workspaceAnimation.js +@@ -73,11 +73,13 @@ class WorkspaceGroup extends Clutter.Actor { + this._shouldShowWindow(w.meta_window)); + + let lastRecord; ++ const bottomActor = this._background ?? null; + + for (const windowActor of windowActors) { + const record = this._windowRecords.find(r => r.windowActor === windowActor); + +- this.set_child_above_sibling(record.clone, lastRecord ? lastRecord.clone : this._background); ++ this.set_child_above_sibling(record.clone, ++ lastRecord ? lastRecord.clone : bottomActor); + lastRecord = record; + } + } +-- +2.35.1 + diff --git a/gnome-shell.spec b/gnome-shell.spec index dc4de8a..76ead9a 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -41,6 +41,7 @@ Patch39: 0001-status-network-Use-wwan-settings-panel-for-GSM-LTE-M.patch Patch40: 0001-welcomeDialog-Adapt-dialog-title.patch Patch41: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch Patch42: fix-markup-in-highlighter.patch +Patch43: 0001-workspaceAnimation-Fix-warning-on-restacking.patch %define eds_version 3.33.1 %define gnome_desktop_version 3.35.91 @@ -262,6 +263,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de * Wed Mar 30 2022 Florian Müllner - 40.9-3 - Fix markup handling in highlighter Resolves: #2049194 +- Fix warning on restacking + Resolves: #2053638 * Mon Feb 28 2022 Ray Strode - 40.9-2 - Depend on and use background extension