[gnome-shell/wip/re-search-v2: 30/33] overview: simplify controls code

[Cosimo Cecchi <cosimoc src gnome org>]

commit 597bef436a96d964e05c09b04eeead196308d673
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Nov 30 01:46:41 2012 -0500

    overview: simplify controls code

 js/ui/overview.js     |   13 +++++--------
 js/ui/viewSelector.js |   10 +++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 5fba3fa..ee6331d 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -268,14 +268,11 @@ const Overview = new Lang.Class({
                                               y_fill: true });
         this._overview.add_actor(this._messageTrayGhost);
 
-        this._viewSelector.connect('search-active-changed', Lang.bind(this,
-            function(viewSelector, active) {
-                this._setSideControlsVisibility(!active);
-            }));
-        this._viewSelector.connect('apps-active-changed', Lang.bind(this,
-            function(viewSelector, active) {
-                this._setSideControlsVisibility(!active);
-            }));
+        this._viewSelector.connect('page-changed', Lang.bind(this,
+            function() {
+                this._setSideControlsVisibility(!this._viewSelector.getSearchActive() &&
+                                                !this._viewSelector.getAppsActive());
+                }));
 
         this.connect('item-drag-begin', Lang.bind(this,
             function() {
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 238af97..2a59511 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -212,7 +212,11 @@ const ViewSelector = new Lang.Class({
         Tweener.addTween(page,
                          { opacity: 255,
                            time: 0.1,
-                           transition: 'easeOutQuad'
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this,
+                               function() {
+                                   this.emit('page-changed');
+                               })
                          });
     },
 
@@ -222,8 +226,6 @@ const ViewSelector = new Lang.Class({
     },
 
     _onShowAppsButtonToggled: function() {
-        this.emit('apps-active-changed', this._showAppsButton.checked);
-
         if (this._searchActive)
             this.reset();
         else
@@ -337,8 +339,6 @@ const ViewSelector = new Lang.Class({
             this._searchResults.startingSearch();
         }
 
-        this.emit('search-active-changed', this._searchActive);
-
         if (this._searchActive) {
             this._entry.set_secondary_icon(this._activeIcon);