From c766230118d1d15ffd7c0209741f77166e72d94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 10 Mar 2021 01:22:27 +0100 Subject: [PATCH] window-list: Only show previews for up to six workspaces On request of GNOME Classic users, we add GNOME2-like workspace previews when using a horizontal workspace layout. The previews scale a lot worse than the menu though, with the risk that they take up all the available width in extreme cases. Address this by also taking the number of workspaces into account, and switch to the menu when we have more than six. This is particularly important now that we switched to a horizontal layout by default. Part-of: --- extensions/window-list/workspaceIndicator.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js index 7314dfc7..41eedf63 100644 --- a/extensions/window-list/workspaceIndicator.js +++ b/extensions/window-list/workspaceIndicator.js @@ -12,6 +12,8 @@ const _ = Gettext.gettext; const TOOLTIP_OFFSET = 6; const TOOLTIP_ANIMATION_TIME = 150; +const MAX_THUMBNAILS = 6; + let WindowPreview = GObject.registerClass( class WindowPreview extends St.Button { _init(window) { @@ -286,13 +288,13 @@ class WorkspaceIndicator extends PanelMenu.Button { workspaceManager.connect_after('workspace-switched', this._onWorkspaceSwitched.bind(this)), workspaceManager.connect('notify::layout-rows', - this._onWorkspaceOrientationChanged.bind(this)), + this._updateThumbnailVisibility.bind(this)), ]; this.connect('scroll-event', this._onScrollEvent.bind(this)); this._updateMenu(); this._updateThumbnails(); - this._onWorkspaceOrientationChanged(); + this._updateThumbnailVisibility(); this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' }); this._settingsChangedId = this._settings.connect( @@ -311,12 +313,15 @@ class WorkspaceIndicator extends PanelMenu.Button { super._onDestroy(); } - _onWorkspaceOrientationChanged() { - let vertical = global.workspace_manager.layout_rows === -1; - this.reactive = vertical; + _updateThumbnailVisibility() { + const { workspaceManager } = global; + const vertical = workspaceManager.layout_rows === -1; + const useMenu = + vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS; + this.reactive = useMenu; - this._statusBin.visible = vertical; - this._thumbnailsBox.visible = !vertical; + this._statusBin.visible = useMenu; + this._thumbnailsBox.visible = !useMenu; } _onWorkspaceSwitched() { @@ -332,6 +337,7 @@ class WorkspaceIndicator extends PanelMenu.Button { _nWorkspacesChanged() { this._updateMenu(); this._updateThumbnails(); + this._updateThumbnailVisibility(); } _updateMenuOrnament() {