From 082eedd968b5964563c1b711e959a6cc40ea1d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sat, 20 Feb 2021 13:34:39 +0100 Subject: [PATCH] workspacesView: Decrease workspaces size on external monitors Now that the backgrounds was moved into workspaces, the fullscreen views on secondary monitors are visually inconsistent with the primary view, as there's no dash or search entry that reduces the available height and allows adjacent workspaces to peek in. Address this by adding padding above and below the view, so that it is limited to 70% of the available height. Part-of: --- js/ui/workspacesView.js | 43 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index e604e73a3..f9c7fcdcc 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -19,6 +19,8 @@ const WORKSPACE_MAX_SPACING = 80; const WORKSPACE_INACTIVE_SCALE = 0.94; +const SECONDARY_WORKSPACE_SCALE = 0.70; + var WorkspacesViewBase = GObject.registerClass({ GTypeFlags: GObject.TypeFlags.ABSTRACT, }, class WorkspacesViewBase extends St.Widget { @@ -616,13 +618,52 @@ class SecondaryMonitorDisplay extends St.Widget { this._updateWorkspacesView(); } + _getWorkspacesBoxForState(state, box, padding) { + const { ControlsState } = OverviewControls; + const workspaceBox = box.copy(); + const [width, height] = workspaceBox.get_size(); + + switch (state) { + case ControlsState.HIDDEN: + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + workspaceBox.set_origin(0, padding); + workspaceBox.set_size( + width, + height - 2 * padding); + break; + } + + return workspaceBox; + } + vfunc_allocate(box) { this.set_allocation(box); const themeNode = this.get_theme_node(); const contentBox = themeNode.get_content_box(box); + const [, height] = contentBox.get_size(); + const padding = + Math.round((1 - SECONDARY_WORKSPACE_SCALE) * height / 2); - this._workspacesView.allocate(contentBox); + const { + currentState, initialState, finalState, transitioning, progress, + } = this._overviewAdjustment.getStateTransitionParams(); + + let workspacesBox; + const workspaceParams = [contentBox, padding]; + if (!transitioning) { + workspacesBox = + this._getWorkspacesBoxForState(currentState, ...workspaceParams); + } else { + const initialBox = + this._getWorkspacesBoxForState(initialState, ...workspaceParams); + const finalBox = + this._getWorkspacesBoxForState(finalState, ...workspaceParams); + workspacesBox = initialBox.interpolate(finalBox, progress); + } + this._workspacesView.allocate(workspacesBox); } _onDestroy() {