[gnome-shell/wip/re-search-v2: 31/33] overview: also hide the messsage tray ghost when switching to search



commit 9499d618e754bbd4a133d180c33902703b28b2d6
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Nov 30 02:53:29 2012 -0500

    overview: also hide the messsage tray ghost when switching to search

 js/ui/dash.js     |   12 +++++++++---
 js/ui/overview.js |    7 ++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 8ab86a5..d02687f 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -944,19 +944,25 @@ const Dash = new Lang.Class({
         this.actor.show();
     },
 
-    show: function() {
+    show: function(callback) {
         Tweener.addTween(this.actor, { translation_x: 0,
                                        transition: 'easeOutQuad',
-                                       time: DASH_ANIMATION_TIME
+                                       time: DASH_ANIMATION_TIME,
+                                       onComplete: function() {
+                                           if (callback)
+                                               callback();
+                                       }
                                      });
     },
 
-    hide: function() {
+    hide: function(callback) {
         let hiddenX = this._computeTranslation();
         Tweener.addTween(this.actor, { translation_x: hiddenX,
                                        transition: 'easeOutQuad',
                                        time: DASH_ANIMATION_TIME,
                                        onComplete: function() {
+                                           if (callback)
+                                               callback();
                                        },
                                        onCompleteScope: this
                                      });
diff --git a/js/ui/overview.js b/js/ui/overview.js
index ee6331d..202a196 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -308,12 +308,16 @@ const Overview = new Lang.Class({
         let searchActive = this._viewSelector.getSearchActive();
 
         if (visible) {
+            this._messageTrayGhost.show();
             this._dash.show();
             this._thumbnailsBox.show();
             Main.messageTray.show();
         } else {
             if (searchActive) {
-                this._dash.hide();
+                this._dash.hide(Lang.bind(this,
+                    function() {
+                        this._messageTrayGhost.hide();
+                    }));
                 Main.messageTray.hide();
             }
 
@@ -537,6 +541,7 @@ const Overview = new Lang.Class({
         // Disable unredirection while in the overview
         Meta.disable_unredirect_for_screen(global.screen);
         global.window_group.hide();
+        this._messageTrayGhost.show();
         this._overview.show();
         this._background.show();
         this._viewSelector.show();



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]