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

dash: Remove show/hide functions

Browse Source 
As Main.overview is now usable from the dash's constructor, move
the setup of signal connections there and remove the show/hide
methods which were used as workaround.

https://bugzilla.gnome.org/show_bug.cgi?id=642196
This commit is contained in:
Florian Müllner 2011-02-12 00:01:59 +01:00
parent f39e693324
commit f1c279765b
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/dash.js
View File

@ -278,26 +278,17 @@ Dash.prototype = {
this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay)); this._appSystem.connect('installed-changed', Lang.bind(this, this._queueRedisplay));
AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay)); AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._queueRedisplay));
this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay)); this._tracker.connect('app-state-changed', Lang.bind(this, this._queueRedisplay));
},
show: function() { Main.overview.connect('item-drag-begin',
this._itemDragBeginId = Main.overview.connect('item-drag-begin',
Lang.bind(this, this._onDragBegin)); Lang.bind(this, this._onDragBegin));
this._itemDragEndId = Main.overview.connect('item-drag-end', Main.overview.connect('item-drag-end',
Lang.bind(this, this._onDragEnd)); Lang.bind(this, this._onDragEnd));
this._windowDragBeginId = Main.overview.connect('window-drag-begin', Main.overview.connect('window-drag-begin',
Lang.bind(this, this._onDragBegin)); Lang.bind(this, this._onDragBegin));
this._windowDragEndId = Main.overview.connect('window-drag-end', Main.overview.connect('window-drag-end',
Lang.bind(this, this._onDragEnd)); Lang.bind(this, this._onDragEnd));
}, },
hide: function() {
Main.overview.disconnect(this._itemDragBeginId);
Main.overview.disconnect(this._itemDragEndId);
Main.overview.disconnect(this._windowDragBeginId);
Main.overview.disconnect(this._windowDragEndId);
},
_onDragBegin: function() { _onDragBegin: function() {
this._dragMonitor = { this._dragMonitor = {
dragMotion: Lang.bind(this, this._onDragMotion) dragMotion: Lang.bind(this, this._onDragMotion)

2
js/ui/overview.js
View File

@ -537,7 +537,6 @@ Overview.prototype = {
this.viewSelector.show(); this.viewSelector.show();
this._workspacesDisplay.show(); this._workspacesDisplay.show();
this.dash.show();
this.workspaces = this._workspacesDisplay.workspacesView; this.workspaces = this._workspacesDisplay.workspacesView;
global.overlay_group.add_actor(this.workspaces.actor); global.overlay_group.add_actor(this.workspaces.actor);
@ -751,7 +750,6 @@ Overview.prototype = {
this._workspacesDisplay.hide(); this._workspacesDisplay.hide();
this.viewSelector.hide(); this.viewSelector.hide();
this.dash.hide();
this._desktopFade.hide(); this._desktopFade.hide();
this._background.hide(); this._background.hide();