From 4e23f4cfc9ccb7cfdb31a1462b9344c736981ab7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 7 Aug 2009 13:30:53 -0400 Subject: [PATCH] Bug 591077 - Hide overlay when activating an application It's easier to explicitly call Main.overlay.hide() instead of chaining activation signals, this got lost in a mix between the big dash rewrite and ongoing changes to the Application well. --- js/ui/appDisplay.js | 4 ++-- js/ui/genericDisplay.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index a3cf04503..6e335216b 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -687,7 +687,7 @@ AppWell.prototype = { this._favoritesArea = new WellArea(width, true); this._favoritesArea.connect('activated', Lang.bind(this, function (a, display) { - this.emit('activated'); + Main.overlay.hide(); })); this.actor.append(this._favoritesArea.actor, Big.BoxPackFlags.NONE); @@ -697,7 +697,7 @@ AppWell.prototype = { padding_top: GenericDisplay.PREVIEW_BOX_PADDING }); this._runningArea = new WellArea(width, false); this._runningArea.connect('activated', Lang.bind(this, function (a, display) { - this.emit('activated'); + Main.overlay.hide(); })); this._runningBox.append(this._runningArea.actor, Big.BoxPackFlags.EXPAND); this.actor.append(this._runningBox, Big.BoxPackFlags.NONE); diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js index 0d7a2ab07..22e26e259 100644 --- a/js/ui/genericDisplay.js +++ b/js/ui/genericDisplay.js @@ -380,7 +380,7 @@ GenericDisplay.prototype = { this._redisplay(true); }, - // Launches the item that is currently selected and emits 'activated' signal. + // Launches the item that is currently selected, closing the overlay activateSelected: function() { if (this._selectedIndex != -1) { let selected = this._findDisplayedByIndex(this._selectedIndex);