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

overview: Make viewSelector private

Browse Source 
It's only used internally by the overview itself,
and by some performance testing code, so don't
expose it as a public object.

https://bugzilla.gnome.org/show_bug.cgi?id=657082
This commit is contained in:
Ray Strode 2011-08-28 09:29:51 -04:00
parent 5088f22388
commit 80a9d2e7c9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/perf/core.js
View File

@ -113,10 +113,10 @@ function run() {
for (let i = 0; i < 2; i++) { for (let i = 0; i < 2; i++) {
Scripting.scriptEvent('applicationsShowStart'); Scripting.scriptEvent('applicationsShowStart');
Main.overview.viewSelector.switchTab('applications'); Main.overview._viewSelector.switchTab('applications');
yield Scripting.waitLeisure(); yield Scripting.waitLeisure();
Scripting.scriptEvent('applicationsShowDone'); Scripting.scriptEvent('applicationsShowDone');
Main.overview.viewSelector.switchTab('windows'); Main.overview._viewSelector.switchTab('windows');
yield Scripting.waitLeisure(); yield Scripting.waitLeisure();
} }
} }

24
js/ui/overview.js
View File

@ -177,26 +177,26 @@ Overview.prototype = {
init: function() { init: function() {
this.shellInfo = new ShellInfo(); this.shellInfo = new ShellInfo();
this.viewSelector = new ViewSelector.ViewSelector(); this._viewSelector = new ViewSelector.ViewSelector();
this._group.add_actor(this.viewSelector.actor); this._group.add_actor(this._viewSelector.actor);
this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay(); this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
this.viewSelector.addViewTab('windows', _("Windows"), this._workspacesDisplay.actor, 'text-x-generic'); this._viewSelector.addViewTab('windows', _("Windows"), this._workspacesDisplay.actor, 'text-x-generic');
let appView = new AppDisplay.AllAppDisplay(); let appView = new AppDisplay.AllAppDisplay();
this.viewSelector.addViewTab('applications', _("Applications"), appView.actor, 'system-run'); this._viewSelector.addViewTab('applications', _("Applications"), appView.actor, 'system-run');
// Default search providers // Default search providers
this.viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider()); this._viewSelector.addSearchProvider(new AppDisplay.AppSearchProvider());
this.viewSelector.addSearchProvider(new AppDisplay.SettingsSearchProvider()); this._viewSelector.addSearchProvider(new AppDisplay.SettingsSearchProvider());
this.viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider()); this._viewSelector.addSearchProvider(new PlaceDisplay.PlaceSearchProvider());
this.viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider()); this._viewSelector.addSearchProvider(new DocDisplay.DocSearchProvider());
// TODO - recalculate everything when desktop size changes // TODO - recalculate everything when desktop size changes
this.dash = new Dash.Dash(); this.dash = new Dash.Dash();
this._group.add_actor(this.dash.actor); this._group.add_actor(this.dash.actor);
this.dash.actor.add_constraint(this.viewSelector.constrainY); this.dash.actor.add_constraint(this._viewSelector.constrainY);
this.dash.actor.add_constraint(this.viewSelector.constrainHeight); this.dash.actor.add_constraint(this._viewSelector.constrainHeight);
// Translators: this is the name of the dock/favorites area on // Translators: this is the name of the dock/favorites area on
// the left of the overview // the left of the overview
@ -474,8 +474,8 @@ Overview.prototype = {
} }
this.dash.actor.set_x(dashX); this.dash.actor.set_x(dashX);
this.viewSelector.actor.set_position(viewX, viewY); this._viewSelector.actor.set_position(viewX, viewY);
this.viewSelector.actor.set_size(viewWidth, viewHeight); this._viewSelector.actor.set_size(viewWidth, viewHeight);
}, },
//// Public methods //// //// Public methods ////