From d185ec4ff0821eb1c1b54450c81602e986767f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Mon, 17 Nov 2025 22:30:06 +0100 Subject: [PATCH] Fix applying num-workspaces setting Resolves: https://issues.redhat.com/browse/RHEL-129121 --- gnome-shell-extensions.spec | 6 +- improve-workspace-names.patch | 143 +++++++++++++++++----------------- 2 files changed, 78 insertions(+), 71 deletions(-) diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 4feb9e2..8dc070b 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -6,7 +6,7 @@ Name: gnome-shell-extensions Version: 3.32.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Modify and extend GNOME Shell functionality and behavior Group: User Interface/Desktops @@ -581,6 +581,10 @@ cp $RPM_SOURCE_DIR/gnome-classic.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions %changelog +* Mon Nov 17 2025 Florian Müllner - 3.32.1-47 +- Fix applying num-workspace setting + Resolves: RHEL-129121 + * Thu Oct 16 2025 Florian Müllner - 3.32.1-46 - Skip creating main panel with no monitor Resolves: RHEL-110378 diff --git a/improve-workspace-names.patch b/improve-workspace-names.patch index 1e05344..4f8552d 100644 --- a/improve-workspace-names.patch +++ b/improve-workspace-names.patch @@ -266,7 +266,7 @@ index 71efa039..19858a39 100644 extension_sources += files('prefs.js') -- -2.51.0 +2.51.1 From c84bfeb065d0200dee5e5ac1eb7ba30feb105360 Mon Sep 17 00:00:00 2001 @@ -408,7 +408,7 @@ index d377f288..101ef7be 100644 }), x_fill: true, -- -2.51.0 +2.51.1 From e2fd7a6f4ab4f783bc475a6a9cf3156ab4ddecad Mon Sep 17 00:00:00 2001 @@ -1365,7 +1365,7 @@ index 55f0e9aa..5cdb710f 100644 extensions/workspace-indicator/prefs.js +extensions/workspace-indicator/workspaceIndicator.js -- -2.51.0 +2.51.1 From dd928d44f1fbc1536c4ae30bad2130c1fc4432ac Mon Sep 17 00:00:00 2001 @@ -1459,7 +1459,7 @@ index 83a0dffa..2b102117 100644 reactive: true }); -- -2.51.0 +2.51.1 From 9a92b49c1835e44b5f3ddf2088f24cf3dd82b8c1 Mon Sep 17 00:00:00 2001 @@ -1532,7 +1532,7 @@ index 8ae9b288..4e8f1aff 100644 this._delegate = this; -- -2.51.0 +2.51.1 From 6db2bc97a0aba60650abff4e82a1b5683db474c5 Mon Sep 17 00:00:00 2001 @@ -1586,7 +1586,7 @@ index 2b102117..57a3f7ec 100644 let container = new St.Widget({ layout_manager: new Clutter.BinLayout(), -- -2.51.0 +2.51.1 From 8f4cc8742093a791bf64470ea2e04b18c37a59e1 Mon Sep 17 00:00:00 2001 @@ -1651,7 +1651,7 @@ index 57a3f7ec..2a026c5d 100644 super._init(0.0, _('Workspace Indicator')); -- -2.51.0 +2.51.1 From 09116b6f8e6477c4347fec0f035e74d508b08288 Mon Sep 17 00:00:00 2001 @@ -1725,7 +1725,7 @@ index 4e8f1aff..48a8eb22 100644 let container = new St.Widget({ -- -2.51.0 +2.51.1 From 86b017644c4a7cb394558f4b96785957aef480ab Mon Sep 17 00:00:00 2001 @@ -1793,7 +1793,7 @@ index 48a8eb22..c362539e 100644 _init(params = {}) { super._init(0.0, _('Workspace Indicator'), true); -- -2.51.0 +2.51.1 From e0d18355ae3af843bc35412f4379d26af0a9ddcd Mon Sep 17 00:00:00 2001 @@ -1884,7 +1884,7 @@ index c362539e..574ebdca 100644 layout_manager: new Clutter.BinLayout(), x_expand: true, -- -2.51.0 +2.51.1 From e3b79e9d113570a89227cd7cb598e20fe61c9bd0 Mon Sep 17 00:00:00 2001 @@ -1927,7 +1927,7 @@ index 394fec1f..aada9525 100644 this.actor.set_position(this._monitor.x, this._monitor.y + this._monitor.height - this.actor.height); -- -2.51.0 +2.51.1 From c8bf13f4e85c1e90535588234a68e66068d02805 Mon Sep 17 00:00:00 2001 @@ -1971,7 +1971,7 @@ index 2a026c5d..b1dfc970 100644 } -- -2.51.0 +2.51.1 From dbb82cf4778e324defa564584badc136c4f54448 Mon Sep 17 00:00:00 2001 @@ -1999,7 +1999,7 @@ index b1dfc970..7177a810 100644 } }); -- -2.51.0 +2.51.1 From c929efb231745e4e66182a9ee08c5cef2725e9d9 Mon Sep 17 00:00:00 2001 @@ -2068,7 +2068,7 @@ index 7177a810..9563bbc1 100644 this._workspacesItems[i].label_actor = this._statusLabel; this._workspacesItems[i].connect('activate', (actor, _event) => { -- -2.51.0 +2.51.1 From 8d38e180ac3a6832185820589f5f4afa450f4cf1 Mon Sep 17 00:00:00 2001 @@ -2110,7 +2110,7 @@ index 9563bbc1..b87420ac 100644 } -- -2.51.0 +2.51.1 From a7d7412b8683e843db154c10fe9ffcd01b38d544 Mon Sep 17 00:00:00 2001 @@ -2176,7 +2176,7 @@ index b87420ac..b772b66d 100644 : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY); } -- -2.51.0 +2.51.1 From e654fa6be51139099f6eaa13f28130a3da0fd556 Mon Sep 17 00:00:00 2001 @@ -2225,7 +2225,7 @@ index b772b66d..f707be79 100644 this._statusLabel.set_text(this._labelText()); -- -2.51.0 +2.51.1 From 3db67516e6bc00f2b9c85aa59b28d9521028fbc9 Mon Sep 17 00:00:00 2001 @@ -2311,7 +2311,7 @@ index f707be79..6783b315 100644 _updateThumbnails() { -- -2.51.0 +2.51.1 From 6ae80e3c952f4fb2e557dbd4dc4ab304f9e82eae Mon Sep 17 00:00:00 2001 @@ -2368,7 +2368,7 @@ index 3f89359b..c8c2370f 100644 .workspace-indicator-window-preview { -- -2.51.0 +2.51.1 From a034be112b74ea09bfa53840ab3c85ce6593bd88 Mon Sep 17 00:00:00 2001 @@ -2507,7 +2507,7 @@ index c8c2370f..b0f7d171 100644 -} +@import url("stylesheet-dark.css"); -- -2.51.0 +2.51.1 From 7bad2503adfbdcf5dfa67288fd7a5abcdd299fb0 Mon Sep 17 00:00:00 2001 @@ -3072,7 +3072,7 @@ index 574ebdca..00000000 -}); - -- -2.51.0 +2.51.1 From 08c0fab926838cb4f3dcf5c3b1b9356c0f0e9f57 Mon Sep 17 00:00:00 2001 @@ -3304,7 +3304,7 @@ index 6783b315..0a5e7b26 100644 - } }); -- -2.51.0 +2.51.1 From 6e8c0b128350d4d8555e2f4750bd551654596917 Mon Sep 17 00:00:00 2001 @@ -3447,7 +3447,7 @@ index 0a5e7b26..1e3db810 100644 global.workspace_manager.disconnect(this._nWorkspacesChanged); for (let i = 0; i < this._workspaceManagerSignals.length; i++) -- -2.51.0 +2.51.1 From 355a224ca85344c876784bcebc119f6dbf657693 Mon Sep 17 00:00:00 2001 @@ -3692,7 +3692,7 @@ index 5cdb710f..eeb36fab 100644 +extensions/workspace-indicator/schemas/org.gnome.shell.extensions.workspace-indicator.gschema.xml extensions/workspace-indicator/workspaceIndicator.js -- -2.51.0 +2.51.1 From ecadaca214f2a7d2154d968bcdd7db927cfc8503 Mon Sep 17 00:00:00 2001 @@ -3749,7 +3749,7 @@ index fd497dc9..3c1d5724 100644 } -- -2.51.0 +2.51.1 From 1748cb00834f7167d9e642a93240ec5f3518a344 Mon Sep 17 00:00:00 2001 @@ -4046,7 +4046,7 @@ index 61d1e982..5663b422 100644 .workspace-indicator-window-preview { -- -2.51.0 +2.51.1 From c98e22e9b33a1a584eef04c25500e65d7423e676 Mon Sep 17 00:00:00 2001 @@ -4090,7 +4090,7 @@ index 1d9b82f0..63e5e48c 100644 background-color: #e1e1e1; } -- -2.51.0 +2.51.1 From f2e31221bbd114bedc1d95d3b49afb1af14d5735 Mon Sep 17 00:00:00 2001 @@ -4646,7 +4646,7 @@ index eeb36fab..ba4c5a46 100644 extensions/workspace-indicator/workspaceIndicator.js +extensions/workspace-indicator/workspacePrefs.js -- -2.51.0 +2.51.1 From 24d307c6cfa14b766f44e8bcba09b3b1dc741056 Mon Sep 17 00:00:00 2001 @@ -4676,7 +4676,7 @@ index 1c65ff6b..0bd4a58b 100644 const sw = new Gtk.Switch({ -- -2.51.0 +2.51.1 From 025580ecd9a522c3d68debbd9e7a9d0464db268e Mon Sep 17 00:00:00 2001 @@ -4712,7 +4712,7 @@ index 2c4f9e49..17e97990 100644 }); -- -2.51.0 +2.51.1 From 232fa86f0ef5e833d1f7fb83812381afdaf3e1d2 Mon Sep 17 00:00:00 2001 @@ -4819,7 +4819,7 @@ index 17e97990..936767c8 100644 }); -- -2.51.0 +2.51.1 From 7722bfec6e5f388c2bf0330b603a9728643c0248 Mon Sep 17 00:00:00 2001 @@ -4846,7 +4846,7 @@ index 3c1d5724..3207e87c 100644 workspaceManager.connect_after('notify::n-workspaces', this._nWorkspacesChanged.bind(this)), -- -2.51.0 +2.51.1 From 3d5f527d2215f49670df7d078910a3144da0f95e Mon Sep 17 00:00:00 2001 @@ -5102,7 +5102,7 @@ index 3207e87c..9bb7cb60 100644 - } }); -- -2.51.0 +2.51.1 From ce6bbf7ba28a0a24045e460b3eeb47aabbeeebe6 Mon Sep 17 00:00:00 2001 @@ -5187,7 +5187,7 @@ index 9bb7cb60..8184efbb 100644 this._updateTopBarRedirect(); } -- -2.51.0 +2.51.1 From d79cb50745803a7e6e7dc663580f1fb233b9130a Mon Sep 17 00:00:00 2001 @@ -5294,7 +5294,7 @@ index 8184efbb..2cd3de5f 100644 - } }); -- -2.51.0 +2.51.1 From bbcbd818726d387a5720686d483c2c79463d84b6 Mon Sep 17 00:00:00 2001 @@ -5385,10 +5385,10 @@ index 2cd3de5f..0a4f33bf 100644 this._updateTopBarRedirect(); } -- -2.51.0 +2.51.1 -From 44d90ef37270d2fa57f282aa9bbd762f01abaf8e Mon Sep 17 00:00:00 2001 +From e4f9acd5f1a46b87b620a513ffc5c3c65e557950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 22 May 2025 21:07:08 +0200 Subject: [PATCH 37/46] workspace-indicator: Reimplement some libadwaita prefs @@ -5397,14 +5397,14 @@ Subject: [PATCH 37/46] workspace-indicator: Reimplement some libadwaita prefs Upstream now makes more use of libawaita, so reimplement the API we need to make backporting a bit less painful. --- - .../workspace-indicator/workspacePrefs.js | 240 ++++++++++++++++++ - 1 file changed, 240 insertions(+) + .../workspace-indicator/workspacePrefs.js | 243 ++++++++++++++++++ + 1 file changed, 243 insertions(+) diff --git a/extensions/workspace-indicator/workspacePrefs.js b/extensions/workspace-indicator/workspacePrefs.js -index 0bd4a58b..a044c681 100644 +index 0bd4a58b..26a0c83b 100644 --- a/extensions/workspace-indicator/workspacePrefs.js +++ b/extensions/workspace-indicator/workspacePrefs.js -@@ -16,6 +16,246 @@ const N_ = e => e; +@@ -16,6 +16,249 @@ const N_ = e => e; const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences'; const WORKSPACE_KEY = 'workspace-names'; @@ -5619,6 +5619,9 @@ index 0bd4a58b..a044c681 100644 + }); + super._init(params); + this.add_suffix(this._spinButton); ++ ++ this._spinButton.connect('notify::value', ++ () => this.notify('value')); + } + + get adjustment() { @@ -5652,10 +5655,10 @@ index 0bd4a58b..a044c681 100644 class GeneralGroup extends Gtk.Box { _init() { -- -2.51.0 +2.51.1 -From 15d59e6f2c207a64f16a9bb2408e29e1f441641d Mon Sep 17 00:00:00 2001 +From 01100f96fbab1803f66071b5f41628c0b1bbb5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 29 Jun 2025 21:26:40 +0200 Subject: [PATCH 38/46] workspace-indicator: Refine preview settings @@ -5669,10 +5672,10 @@ Part-of: Date: Thu, 22 May 2025 16:20:05 +0200 Subject: [PATCH 39/46] workspace-indicator: Include workspace settings @@ -5743,10 +5746,10 @@ Part-of: %s'.format(_('Workspace Names')), -- -2.51.0 +2.51.1 -From 05bd2e81a9fbebecdccbe355e942538bfef19bc1 Mon Sep 17 00:00:00 2001 +From 9119e2a102705fc7b3194043b13a13bb35ba4581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 28 May 2025 21:01:08 +0200 Subject: [PATCH 40/46] workspace-indicator: Allow changing workspace names @@ -6093,10 +6096,10 @@ index 0a4f33bf..b29e1463 100644 } -- -2.51.0 +2.51.1 -From 17698893275c194d6876272a69f8cc069216a6b1 Mon Sep 17 00:00:00 2001 +From 4d7361b147d8737747d78cc932c731eafc966499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 28 May 2025 21:04:36 +0200 Subject: [PATCH 41/46] workspace-indicator: Remove workspace names from prefs @@ -6110,7 +6113,7 @@ Part-of: Date: Fri, 30 May 2025 16:39:22 +0200 Subject: [PATCH 42/46] window-list: Adjust to workspace-indicator changes @@ -6374,10 +6377,10 @@ index 349404c5..7da8ac7a 100644 spacing: 2px; font-size: 10pt; -- -2.51.0 +2.51.1 -From f89c9ac37f68b04e4d8d440b72ed6ef8f70c8ad9 Mon Sep 17 00:00:00 2001 +From 1d177b70db6a76e4cad9990b87f1f4f1ef86e428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 2 Jul 2024 19:04:10 +0200 Subject: [PATCH 43/46] workspace-indicator: Re-fittsify workspace previews @@ -6487,10 +6490,10 @@ index b29e1463..9a403c6d 100644 } -- -2.51.0 +2.51.1 -From 603f5fc016b3be74eb22ba23074f9e66a9c79ef5 Mon Sep 17 00:00:00 2001 +From 33ce877db3313194b1d3b12722fe86ba3f093cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 16 Oct 2025 14:40:40 +0200 Subject: [PATCH 44/46] workspace-indicator: Add some adwaita-like styling @@ -6502,10 +6505,10 @@ add some basic styling to not have some look completely terrible. 1 file changed, 16 insertions(+) diff --git a/extensions/workspace-indicator/workspacePrefs.js b/extensions/workspace-indicator/workspacePrefs.js -index 17e98d2d..45f1c557 100644 +index a2ced86a..44b73f2a 100644 --- a/extensions/workspace-indicator/workspacePrefs.js +++ b/extensions/workspace-indicator/workspacePrefs.js -@@ -363,6 +363,22 @@ class WorkspacesPage extends Gtk.ScrolledWindow { +@@ -366,6 +366,22 @@ class WorkspacesPage extends Gtk.ScrolledWindow { vexpand:true, }); @@ -6529,10 +6532,10 @@ index 17e98d2d..45f1c557 100644 orientation: Gtk.Orientation.VERTICAL, halign: Gtk.Align.CENTER, -- -2.51.0 +2.51.1 -From 25644f5386cd988ec1ff909cde0caf0d3b040b96 Mon Sep 17 00:00:00 2001 +From deea5ab65c809d1b83a79ff2f87c3444b5e538a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Sep 2025 13:55:45 +0200 Subject: [PATCH 45/46] workspace-indicator: Add missing return value to event @@ -6567,10 +6570,10 @@ index 9a403c6d..6f577e52 100644 this._keyFocusId = global.stage.connect('notify::key-focus', () => { -- -2.51.0 +2.51.1 -From 105240d0addbd14fb3436ea7318e4a00b995f6d9 Mon Sep 17 00:00:00 2001 +From b5b0f91fac7671328cc5a6aeb6c3953b4f9adca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Sep 2025 17:15:04 +0200 Subject: [PATCH 46/46] workspace-indicator: Ignore 'e' press when already in @@ -6600,5 +6603,5 @@ index 6f577e52..83b93f3c 100644 return Clutter.EVENT_STOP; }); -- -2.51.0 +2.51.1