Fix workspace-indicator cleanups

Resolves: https://issues.redhat.com/browse/RHEL-129395
This commit is contained in:
Florian Müllner 2025-11-18 17:07:01 +01:00
parent 34ad4d52c3
commit 64a651bf4d
No known key found for this signature in database
2 changed files with 32 additions and 18 deletions

View File

@ -7,7 +7,7 @@
Name: gnome-shell-extensions
Version: 40.7
Release: 30%{?dist}
Release: 31%{?dist}
Summary: Modify and extend GNOME Shell functionality and behavior
License: GPLv2+
@ -473,6 +473,10 @@ workspaces.
%changelog
* Tue Nov 18 2025 Florian Müllner <fmuellner@redhat.com> - 40.7-31
- Fix workspace indicator cleanups
Resolves: RHEL-129395
* Mon Nov 17 2025 Florian Müllner <fmuellner@redhat.com> - 40.7-30
- Fix applying num-workspaces setting
Resolves: RHEL-129101

View File

@ -1213,7 +1213,7 @@ index ca4466cc..8e22e6b1 100644
2.51.1
From 76d29eac11b2276a90704b38d43c6a2089130f84 Mon Sep 17 00:00:00 2001
From 1bd51d790447ac3329c8fcb399f472e2baaf17db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 22 May 2025 20:59:58 +0200
Subject: [PATCH 12/19] workspace-indicator: Show full name when using menu
@ -1223,9 +1223,9 @@ sense to expose them without opening the menu.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/405>
---
.../workspace-indicator/stylesheet-dark.css | 8 +++++
.../workspace-indicator/workspaceIndicator.js | 34 +++++++------------
2 files changed, 21 insertions(+), 21 deletions(-)
.../workspace-indicator/stylesheet-dark.css | 8 ++++
.../workspace-indicator/workspaceIndicator.js | 37 +++++++------------
2 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/extensions/workspace-indicator/stylesheet-dark.css b/extensions/workspace-indicator/stylesheet-dark.css
index 1ca929f9..d35a5dfc 100644
@ -1249,7 +1249,7 @@ index 1ca929f9..d35a5dfc 100644
.workspace-indicator .workspaces-view.hfade {
-st-hfade-offset: 20px;
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
index 8e22e6b1..ced16256 100644
index 8e22e6b1..d47fbd13 100644
--- a/extensions/workspace-indicator/workspaceIndicator.js
+++ b/extensions/workspace-indicator/workspaceIndicator.js
@@ -514,15 +514,23 @@ class WorkspaceIndicator extends PanelMenu.Button {
@ -1292,7 +1292,17 @@ index 8e22e6b1..ced16256 100644
this.connect('scroll-event',
(a, event) => Main.wm.handleWorkspaceScroll(event));
@@ -573,7 +576,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
@@ -558,9 +561,6 @@ class WorkspaceIndicator extends PanelMenu.Button {
}
_onDestroy() {
- for (let i = 0; i < this._workspaceManagerSignals.length; i++)
- global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
-
if (this._inTopBar)
Main.panel.set_offscreen_redirect(Clutter.OffscreenRedirect.ALWAYS);
this._inTopBar = false;
@@ -573,7 +573,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
this.reactive = !usePreviews;
this._thumbnails.visible = usePreviews;
@ -1301,7 +1311,7 @@ index 8e22e6b1..ced16256 100644
if (usePreviews)
this.add_style_class_name('previews');
@@ -593,15 +596,4 @@ class WorkspaceIndicator extends PanelMenu.Button {
@@ -593,15 +593,4 @@ class WorkspaceIndicator extends PanelMenu.Button {
? Clutter.OffscreenRedirect.ALWAYS
: Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
}
@ -1321,7 +1331,7 @@ index 8e22e6b1..ced16256 100644
2.51.1
From c7711dccdce04feadb86857dd6120a68f946439c Mon Sep 17 00:00:00 2001
From 92cce4da58a748eb65980c604b340cf2b3d930d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Mon, 9 Jun 2025 18:10:14 +0200
Subject: [PATCH 13/19] workspace-indicator: Add background when using name
@ -1389,10 +1399,10 @@ index 049b6a38..5191923c 100644
background-color: #ccc;
}
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
index ced16256..11ae9f5f 100644
index d47fbd13..427aef68 100644
--- a/extensions/workspace-indicator/workspaceIndicator.js
+++ b/extensions/workspace-indicator/workspaceIndicator.js
@@ -578,10 +578,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
@@ -575,10 +575,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
this._thumbnails.visible = usePreviews;
this._statusBox.visible = !usePreviews;
@ -1412,7 +1422,7 @@ index ced16256..11ae9f5f 100644
2.51.1
From eac28c6bf2e2b8c82749fcd5a27512b8c38d9a42 Mon Sep 17 00:00:00 2001
From c16736b3da4ee702ee32c844a3606e364e063dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 22 May 2025 21:07:08 +0200
Subject: [PATCH 14/19] workspace-indicator: Reimplement some libadwaita prefs
@ -1680,7 +1690,7 @@ index 77c333f1..9e2f25b9 100644
2.51.1
From 68b309f7e4eb1bc3892f9bc415c11c5503802ee4 Mon Sep 17 00:00:00 2001
From 6b1f02d8c38e5a649ac886a26fcc57be6c2b0f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 29 Jun 2025 21:26:40 +0200
Subject: [PATCH 15/19] workspace-indicator: Refine preview settings
@ -1753,7 +1763,7 @@ index 9e2f25b9..d8ad902f 100644
2.51.1
From 6e6d1cdd03572121f592295d1521f90c525e29f7 Mon Sep 17 00:00:00 2001
From ed92b9fe869dc8a6b11e04278192024e88146c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 22 May 2025 16:20:05 +0200
Subject: [PATCH 16/19] workspace-indicator: Include workspace settings
@ -1856,7 +1866,7 @@ index d8ad902f..d037ef80 100644
2.51.1
From 80812c232f338c6be96d19a39c57f11a8f336953 Mon Sep 17 00:00:00 2001
From 3fabfb8e852d932129bbaf60646fcd73683e1966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 28 May 2025 21:01:08 +0200
Subject: [PATCH 17/19] workspace-indicator: Allow changing workspace names
@ -1953,7 +1963,7 @@ index 5191923c..e4f2b45a 100644
+ background-color: #185fb4;
+}
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
index 11ae9f5f..4f374653 100644
index 427aef68..43315280 100644
--- a/extensions/workspace-indicator/workspaceIndicator.js
+++ b/extensions/workspace-indicator/workspaceIndicator.js
@@ -4,7 +4,7 @@
@ -2116,7 +2126,7 @@ index 11ae9f5f..4f374653 100644
2.51.1
From 2a2226ee90330962360db1b5238c65bfb59d416f Mon Sep 17 00:00:00 2001
From 976529e158e43599c35de4ac18832fef332b33b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 28 May 2025 21:04:36 +0200
Subject: [PATCH 18/19] workspace-indicator: Remove workspace names from prefs
@ -2339,7 +2349,7 @@ index d037ef80..3fd932c0 100644
2.51.1
From ddc1da768b7854907a2a14fa09fd06c917035faf Mon Sep 17 00:00:00 2001
From bed8bb3da1a813d6b203e4ea6e3bbb3393fbe7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 30 May 2025 16:39:22 +0200
Subject: [PATCH 19/19] window-list: Adjust to workspace-indicator changes