From 791682e836dd60c194187d6d2dedb903aba9781b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 13 Jan 2025 16:11:09 +0100 Subject: [PATCH 1/3] ci: Switch ci-templates to master The alternative is to monitor the upstream repository and update the references when necessary. I don't have the resources to do that, so trust upstream to not mess up their development branch. (cherry picked from commit 4e50e9f8dc3ca9714e5d4eff67654bbe381b28fd) Part-of: --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 521e642f..7ad53942 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,8 +3,8 @@ # SPDX-License-Identifier: GPL-2.0-or-later include: - - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml' - - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml" + - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/fedora.yml' + - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/ci-fairy.yml" - component: gitlab.gnome.org/GNOME/citemplates/release-service@master inputs: job-stage: deploy From a7d4d8df8099d7a1e21ce3e005168794fe57f5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 15 Jan 2025 12:36:51 +0100 Subject: [PATCH 2/3] window-list: Use correct params when re-tracking chrome Since commit 981e8e42, we temporarily untrack the window-list actor while in the overview. However as we don't pass pass the chrome parameters when re-tracking chrome, the window-list no longer contributes to struts or tracks fullscreen changes, whoops. Make sure to pass the original parameters when re-tracking chrome to restore the expected behavior. Fixes: 981e8e42 ("window-list: Untrack chrome while in overview") Closes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/550 Part-of: (cherry picked from commit 01f7df1e8a2de1340589dbcd47f98ff6a1744035) --- extensions/window-list/extension.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index e78021fe..4d6e4d96 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -818,7 +818,7 @@ class WindowList extends St.Widget { this._updateKeyboardAnchor(); }, 'hidden', () => { - Main.layoutManager.trackChrome(this); + Main.layoutManager.trackChrome(this, chromeOptions); this.visible = !this._monitor.inFullscreen; this._updateKeyboardAnchor(); }, this); From fa5c4bade155045c3f1ff5516afd8cc12eda3813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 5 Feb 2025 00:40:33 +0100 Subject: [PATCH 3/3] Bump version to 47.4 Update NEWS. --- NEWS | 8 ++++++++ meson.build | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 64802596..ef2e6d02 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +47.4 +==== +* window-list: Fix regression in chrome tracking [Florian; !379] +* Misc. bug fixes and cleanups [Florian; !376] + +Contributors: + Florian Müllner + 47.3 ==== * places-menu: Fix opening drives with mount operations [Florian; !361] diff --git a/meson.build b/meson.build index 7a64c2d8..27c04818 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'gnome-shell-extensions', - version: '47.3', + version: '47.4', meson_version: '>= 1.1.0', license: 'GPL-2.0-or-later', )