From 4999d4534ab671c0362dd0818638f0d1850042e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 2 Dec 2024 17:42:25 +0100 Subject: [PATCH] Fix app grid with dash-to-panel extension Resolves: https://issues.redhat.com/browse/RHEL-69665 --- ...to-panel-Remove-faulty-version-check.patch | 48 +++++++++++++++++++ gnome-shell-extensions.spec | 7 ++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 0001-dash-to-panel-Remove-faulty-version-check.patch diff --git a/0001-dash-to-panel-Remove-faulty-version-check.patch b/0001-dash-to-panel-Remove-faulty-version-check.patch new file mode 100644 index 0000000..ffe277e --- /dev/null +++ b/0001-dash-to-panel-Remove-faulty-version-check.patch @@ -0,0 +1,48 @@ +From 7ed5e50cc978b7fda34aaaf56e8bf4d499f4676d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Mon, 2 Dec 2024 17:34:58 +0100 +Subject: [PATCH] dash-to-panel: Remove faulty version check + +In a string comparison, '40.10' is *smaller* than '40.3', so the +overview ends up being monkey-patched for an older version. + +Unbreak the app grid by removing the check altogether, as we don't +have to care about older versions. +--- + extensions/dash-to-panel/overview.js | 20 ++++++++------------ + 1 file changed, 8 insertions(+), 12 deletions(-) + +diff --git a/extensions/dash-to-panel/overview.js b/extensions/dash-to-panel/overview.js +index 57600a5c..38f04c75 100644 +--- a/extensions/dash-to-panel/overview.js ++++ b/extensions/dash-to-panel/overview.js +@@ -581,18 +581,14 @@ var dtpOverview = Utils.defineClass({ + const workspaceAppGridBox = + this._cachedWorkspaceBoxes.get(OverviewControls.ControlsState.APP_GRID); + +- if (Config.PACKAGE_VERSION > '40.3') { +- const monitor = Main.layoutManager.findMonitorForActor(this._container); +- const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); +- const workAreaBox = new Clutter.ActorBox(); +- +- workAreaBox.set_origin(startX, startY); +- workAreaBox.set_size(workArea.width, workArea.height); +- +- params = [workAreaBox, searchHeight, dashHeight, workspaceAppGridBox] +- } else { +- params = [box, startX, searchHeight, dashHeight, workspaceAppGridBox]; +- } ++ const monitor = Main.layoutManager.findMonitorForActor(this._container); ++ const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); ++ const workAreaBox = new Clutter.ActorBox(); ++ ++ workAreaBox.set_origin(startX, startY); ++ workAreaBox.set_size(workArea.width, workArea.height); ++ ++ params = [workAreaBox, searchHeight, dashHeight, workspaceAppGridBox] + + let appDisplayBox; + if (!transitionParams.transitioning) { +-- +2.47.1 + diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 774d887..088c1bc 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -7,7 +7,7 @@ Name: gnome-shell-extensions Version: 40.7 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior License: GPLv2+ @@ -50,6 +50,7 @@ Patch027: more-ws-previews.patch Patch028: 0001-Add-move-clock-extension.patch Patch029: 0001-workspace-indicator-Re-fittsify-workspace-previews.patch Patch030: window-list-reordering.patch +Patch031: 0001-dash-to-panel-Remove-faulty-version-check.patch %description GNOME Shell Extensions is a collection of extensions providing additional and @@ -468,6 +469,10 @@ workspaces. %changelog +* Mon Dec 02 2024 Florian Müllner - 40.7-23 +- Fix app grid with dash-to-panel extension + Resolves: RHEL-69665 + * Tue Nov 19 2024 Florian Müllner - 40.7-22 - Fix another bug in window-list reordering backport Resolves: RHEL-22692