[gnome-shell/wip/re-search-v2: 32/33] dash: ignore height changes if we're hidden



commit efe8ad902829bb2825f29b5aa92273e7896c0280
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sun Dec 2 13:21:14 2012 -0500

    dash: ignore height changes if we're hidden

 js/ui/dash.js |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/js/ui/dash.js b/js/ui/dash.js
index d02687f..9edc5a9 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -371,6 +371,7 @@ const Dash = new Lang.Class({
         this._maxHeight = -1;
         this.iconSize = 64;
         this._shownInitially = false;
+        this._ignoreHeight = false;
 
         this._dragPlaceholder = null;
         this._dragPlaceholderPos = -1;
@@ -396,7 +397,10 @@ const Dash = new Lang.Class({
         this.actor = new St.Bin({ child: this._container });
         this.actor.connect('notify::height', Lang.bind(this,
             function() {
-                if (this._maxHeight != this.actor.height)
+                if (this._ignoreHeight)
+                    return;
+
+                if (this._maxHeight != this.actor.height);
                     this._queueRedisplay();
                 if (this.actor.height > this._maxHeight)
                     this._maxHeight = this.actor.height;
@@ -951,11 +955,13 @@ const Dash = new Lang.Class({
                                        onComplete: function() {
                                            if (callback)
                                                callback();
+                                           this._ignoreHeight = false;
                                        }
                                      });
     },
 
     hide: function(callback) {
+        this._ignoreHeight = true;
         let hiddenX = this._computeTranslation();
         Tweener.addTween(this.actor, { translation_x: hiddenX,
                                        transition: 'easeOutQuad',



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