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

overviewControls: Use adjustment to control layout

Browse Source 
Right now, the adjustment is fixed at ControlsState.WINDOW_PICKER,
but soon it will be propagated to ViewSelector to control the
transitions.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1624>
This commit is contained in:
Georges Basile Stavracas Neto 2020-12-30 17:32:03 -03:00 committed by Marge Bot
parent 55510e9cdf
commit 3887253823
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/overviewControls.js
View File

@ -6,14 +6,23 @@ const { Clutter, GObject, St } = imports.gi;
const Dash = imports.ui.dash; const Dash = imports.ui.dash;
const ViewSelector = imports.ui.viewSelector; const ViewSelector = imports.ui.viewSelector;
var ControlsState = {
HIDDEN: 0,
WINDOW_PICKER: 1,
APP_GRID: 2,
};
var ControlsManagerLayout = GObject.registerClass( var ControlsManagerLayout = GObject.registerClass(
class ControlsManagerLayout extends Clutter.BoxLayout { class ControlsManagerLayout extends Clutter.BoxLayout {
_init(searchEntry, viewSelector, dash) { _init(searchEntry, viewSelector, dash, stateAdjustment) {
super._init({ orientation: Clutter.Orientation.VERTICAL }); super._init({ orientation: Clutter.Orientation.VERTICAL });
this._stateAdjustment = stateAdjustment;
this._searchEntry = searchEntry; this._searchEntry = searchEntry;
this._viewSelector = viewSelector; this._viewSelector = viewSelector;
this._dash = dash; this._dash = dash;
stateAdjustment.connect('notify::value', () => this.layout_changed());
} }
vfunc_set_container(container) { vfunc_set_container(container) {
@ -46,9 +55,18 @@ class ControlsManagerLayout extends Clutter.BoxLayout {
availableHeight -= dashHeight + spacing; availableHeight -= dashHeight + spacing;
// ViewSelector // ViewSelector
const initialBox = new Clutter.ActorBox();
initialBox.set_origin(0, 0);
initialBox.set_size(width, height);
childBox.set_origin(0, searchHeight + spacing); childBox.set_origin(0, searchHeight + spacing);
childBox.set_size(width, availableHeight); childBox.set_size(width, availableHeight);
this._viewSelector.allocate(childBox);
const page = this._viewSelector.getActivePage();
const progress = page === ViewSelector.ViewPage.SEARCH
? 1 : Math.min(this._stateAdjustment.value, 1);
const viewSelectorBox = initialBox.interpolate(childBox, progress);
this._viewSelector.allocate(viewSelectorBox);
} }
}); });
@ -93,6 +111,13 @@ class ControlsManager extends St.Widget {
upper: workspaceManager.n_workspaces, upper: workspaceManager.n_workspaces,
}); });
this._stateAdjustment = new St.Adjustment({
actor: this,
value: ControlsState.WINDOW_PICKER,
lower: ControlsState.HIDDEN,
upper: ControlsState.APP_GRID,
});
this._nWorkspacesNotifyId = this._nWorkspacesNotifyId =
workspaceManager.connect('notify::n-workspaces', workspaceManager.connect('notify::n-workspaces',
this._updateAdjustment.bind(this)); this._updateAdjustment.bind(this));
@ -105,7 +130,7 @@ class ControlsManager extends St.Widget {
this.add_child(this.viewSelector); this.add_child(this.viewSelector);
this.layout_manager = new ControlsManagerLayout(searchEntryBin, this.layout_manager = new ControlsManagerLayout(searchEntryBin,
this.viewSelector, this.dash); this.viewSelector, this.dash, this._stateAdjustment);
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }