e6414d8afc
Re-apply rebased and updated version of the RHEL 9 downstream patches, with some exceptions: Branding is still TBD, so has been left out for now. The desktop-icons extension will be replaced by an upstreamed version of desktop-icons-ng, which is still work-in-progress. Both dash-to-dock and dash-to-panel will be moved to separate packages, based on the existing Fedora package. It was decided to drop the panel-favorites and updates-dialog extensions. Resolves: RHEL-34255
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From f14ae4e2725b4a98ec2e11151c4162e7a6494604 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
|
Date: Wed, 21 Feb 2024 16:35:09 +0100
|
|
Subject: [PATCH 15/28] workspace-indicator: Include n-workspaces in status
|
|
label
|
|
|
|
The two extensions currently use a slightly different label
|
|
in menu mode:
|
|
The workspace indicator uses the plain workspace number ("2"),
|
|
while the window list includes the number of workspaces ("2 / 4").
|
|
|
|
The additional information seem useful, as well as the slightly
|
|
bigger click/touch target, so copy the window-list behavior.
|
|
|
|
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/307>
|
|
---
|
|
extensions/workspace-indicator/workspaceIndicator.js | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
|
|
index 0538e6b2..594a9e51 100644
|
|
--- a/extensions/workspace-indicator/workspaceIndicator.js
|
|
+++ b/extensions/workspace-indicator/workspaceIndicator.js
|
|
@@ -388,8 +388,9 @@ export class WorkspaceIndicator extends PanelMenu.Button {
|
|
}
|
|
|
|
_getStatusText() {
|
|
+ const {nWorkspaces} = global.workspace_manager;
|
|
const current = this._currentWorkspace + 1;
|
|
- return `${current}`;
|
|
+ return `${current} / ${nWorkspaces}`;
|
|
}
|
|
|
|
_updateMenuLabels() {
|
|
--
|
|
2.44.0
|
|
|