From f72c6ed223c3d348bdf32c25b54b6c44a826eb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Sun, 3 Mar 2024 15:05:23 +0100
Subject: [PATCH 26/28] workspace-indicator: Also show previews in menu

Since the regular session also switched to horizontal workspaces,
using a vertical menu has been a bit awkward.

Now that our previews have become more flexible, we can use them
in the collapsed state as well as when embedded into the top bar.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/316>
---
 .../workspace-indicator/stylesheet-dark.css   | 25 ++++++-
 .../workspace-indicator/workspaceIndicator.js | 74 +++----------------
 2 files changed, 36 insertions(+), 63 deletions(-)

diff --git a/extensions/workspace-indicator/stylesheet-dark.css b/extensions/workspace-indicator/stylesheet-dark.css
index 22d13370..b4a716b8 100644
--- a/extensions/workspace-indicator/stylesheet-dark.css
+++ b/extensions/workspace-indicator/stylesheet-dark.css
@@ -13,18 +13,41 @@
   -st-hfade-offset: 20px;
 }
 
+.workspace-indicator-menu .workspaces-view {
+  max-width: 480px;
+}
+
 .workspace-indicator .workspaces-box {
   padding: 5px;
   spacing: 3px;
 }
 
+.workspace-indicator-menu .workspaces-box {
+  padding: 5px;
+  spacing: 6px;
+}
+
+.workspace-indicator-menu .workspace-box {
+  spacing: 6px;
+}
+
+.workspace-indicator-menu .workspace,
 .workspace-indicator .workspace {
-  width: 52px;
   border: 2px solid transparent;
   border-radius: 4px;
   background-color: #3f3f3f;
 }
 
+.workspace-indicator .workspace {
+  width: 52px;
+}
+
+.workspace-indicator-menu .workspace {
+  height: 80px;
+  width: 160px;
+}
+
+.workspace-indicator-menu .workspace.active,
 .workspace-indicator .workspace.active {
   border-color: #9f9f9f;
 }
diff --git a/extensions/workspace-indicator/workspaceIndicator.js b/extensions/workspace-indicator/workspaceIndicator.js
index 087d2d89..a4d3bbee 100644
--- a/extensions/workspace-indicator/workspaceIndicator.js
+++ b/extensions/workspace-indicator/workspaceIndicator.js
@@ -429,7 +429,7 @@ export class WorkspaceIndicator extends PanelMenu.Button {
     }
 
     constructor(params = {}) {
-        super(0.5, _('Workspace Indicator'));
+        super(0.5, _('Workspace Indicator'), true);
 
         const {
             baseStyleClass = 'workspace-indicator',
@@ -461,7 +461,7 @@ export class WorkspaceIndicator extends PanelMenu.Button {
         this._workspacesItems = [];
 
         workspaceManager.connectObject(
-            'notify::n-workspaces', this._nWorkspacesChanged.bind(this), GObject.ConnectFlags.AFTER,
+            'notify::n-workspaces', this._updateThumbnailVisibility.bind(this), GObject.ConnectFlags.AFTER,
             'workspace-switched', this._onWorkspaceSwitched.bind(this), GObject.ConnectFlags.AFTER,
             this);
 
@@ -477,13 +477,7 @@ export class WorkspaceIndicator extends PanelMenu.Button {
             this._updateTopBarRedirect();
         });
 
-        this._updateMenu();
         this._updateThumbnailVisibility();
-
-        const desktopSettings =
-            new Gio.Settings({schema_id: 'org.gnome.desktop.wm.preferences'});
-        desktopSettings.connectObject('changed::workspace-names',
-            () => this._updateMenuLabels(), this);
     }
 
     _onDestroy() {
@@ -502,6 +496,10 @@ export class WorkspaceIndicator extends PanelMenu.Button {
         this._statusLabel.visible = useMenu;
         this._thumbnails.visible = !useMenu;
 
+        this.setMenu(useMenu
+            ? this._createPreviewMenu()
+            : null);
+
         this._updateTopBarRedirect();
     }
 
@@ -518,69 +516,21 @@ export class WorkspaceIndicator extends PanelMenu.Button {
 
     _onWorkspaceSwitched() {
         this._currentWorkspace = global.workspace_manager.get_active_workspace_index();
-
-        this._updateMenuOrnament();
-
         this._statusLabel.set_text(this._getStatusText());
     }
 
-    _nWorkspacesChanged() {
-        this._updateMenu();
-        this._updateThumbnailVisibility();
-    }
-
-    _updateMenuOrnament() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            this._workspacesItems[i].setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NO_DOT);
-        }
-    }
-
     _getStatusText() {
         const {nWorkspaces} = global.workspace_manager;
         const current = this._currentWorkspace + 1;
         return `${current} / ${nWorkspaces}`;
     }
 
-    _updateMenuLabels() {
-        for (let i = 0; i < this._workspacesItems.length; i++) {
-            const item = this._workspacesItems[i];
-            item.label.text = Meta.prefs_get_workspace_name(i);
-        }
-    }
-
-    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
-        this.menu.removeAll();
-        this._workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace_index();
+    _createPreviewMenu() {
+        const menu = new PopupMenu.PopupMenu(this, 0.5, St.Side.TOP);
 
-        for (let i = 0; i < workspaceManager.n_workspaces; i++) {
-            const name = Meta.prefs_get_workspace_name(i);
-            const item = new PopupMenu.PopupMenuItem(name);
-
-            item.connect('activate',
-                () => this._activate(i));
-
-            item.setOrnament(i === this._currentWorkspace
-                ? PopupMenu.Ornament.DOT
-                : PopupMenu.Ornament.NO_DOT);
-
-            this.menu.addMenuItem(item);
-            this._workspacesItems[i] = item;
-        }
-
-        this._statusLabel.set_text(this._getStatusText());
-    }
-
-    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if (index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
-            metaWorkspace.activate(global.get_current_time());
-        }
+        const previews = new WorkspacePreviews({show_labels: true});
+        menu.box.add_child(previews);
+        menu.actor.add_style_class_name(`${baseStyleClassName}-menu`);
+        return menu;
     }
 }
-- 
2.44.0