isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

overviewControls: Use new workspaces adjustment API

Browse Source 
Derive the workspaces adjustment used by OverviewControls (and
shared with WorkspacesView) from the main workspaces adjustment
using the new Main.createWorkspacesAdjustment() method.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2881>
This commit is contained in:
Georges Basile Stavracas Neto 2023-08-10 16:56:01 -03:00 committed by Marge Bot
parent 4d963c432b
commit 13f4c781d5
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/ui/overviewControls.js
View File

@ -345,25 +345,11 @@ class ControlsManager extends St.Widget {
this.dash = new Dash.Dash(); this.dash = new Dash.Dash();
let workspaceManager = global.workspace_manager; this._workspaceAdjustment = Main.createWorkspacesAdjustment(this);
let activeWorkspaceIndex = workspaceManager.get_active_workspace_index();
this._workspaceAdjustment = new St.Adjustment({
actor: this,
value: activeWorkspaceIndex,
lower: 0,
page_increment: 1,
page_size: 1,
step_increment: 0,
upper: workspaceManager.n_workspaces,
});
this._stateAdjustment = new OverviewAdjustment(this); this._stateAdjustment = new OverviewAdjustment(this);
this._stateAdjustment.connect('notify::value', this._update.bind(this)); this._stateAdjustment.connect('notify::value', this._update.bind(this));
workspaceManager.connectObject(
'notify::n-workspaces', () => this._updateAdjustment(), this);
this._searchController = new SearchController.SearchController( this._searchController = new SearchController.SearchController(
this._searchEntry, this._searchEntry,
this.dash.showAppsButton); this.dash.showAppsButton);
@ -708,19 +694,6 @@ class ControlsManager extends St.Widget {
} }
} }
_updateAdjustment() {
let workspaceManager = global.workspace_manager;
let newNumWorkspaces = workspaceManager.n_workspaces;
let activeIndex = workspaceManager.get_active_workspace_index();
this._workspaceAdjustment.upper = newNumWorkspaces;
// A workspace might have been inserted or removed before the active
// one, causing the adjustment to go out of sync, so update the value
this._workspaceAdjustment.remove_transition('value');
this._workspaceAdjustment.value = activeIndex;
}
vfunc_unmap() { vfunc_unmap() {
super.vfunc_unmap(); super.vfunc_unmap();
this._workspacesDisplay?.hide(); this._workspacesDisplay?.hide();