messageTray: hide removed notification without tweening

This reflects more accurately what happens when a notification is removed.

this._pointerInTray value needs to be set to false in this case.
This commit is contained in:
Marina Zhurakhinskaya 2012-08-19 18:21:50 -04:00 committed by Jasper St. Pierre
parent 4a214d8238
commit f8eab659d9

View File

@ -2117,19 +2117,27 @@ const MessageTray = new Lang.Class({
this._notificationExpandedId = 0; this._notificationExpandedId = 0;
} }
this._tween(this._notificationBin, '_notificationState', State.HIDDEN, if (this._notificationRemoved) {
{ y: this.actor.height, this._notificationBin.y = this.actor.height;
opacity: 0, this._notificationBin.opacity = 0;
time: ANIMATION_TIME, this._notificationState = State.HIDDEN;
transition: 'easeOutQuad', this._hideNotificationCompleted();
onComplete: this._hideNotificationCompleted, } else {
onCompleteScope: this this._tween(this._notificationBin, '_notificationState', State.HIDDEN,
}); { y: this.actor.height,
opacity: 0,
time: ANIMATION_TIME,
transition: 'easeOutQuad',
onComplete: this._hideNotificationCompleted,
onCompleteScope: this
});
}
}, },
_hideNotificationCompleted: function() { _hideNotificationCompleted: function() {
this._notificationRemoved = false; this._notificationRemoved = false;
this._notificationBin.hide(); this._notificationBin.hide();
this._pointerInTray = false;
this._notificationBin.child = null; this._notificationBin.child = null;
this._notification.collapseCompleted(); this._notification.collapseCompleted();
this._notification.disconnect(this._notificationClickedId); this._notification.disconnect(this._notificationClickedId);