isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MessageTray: be explicit about removing tweens

Browse Source 
Turns out that tweener has a very complex logic to decide when a new
tween on the same properties overrides completely the old, and unfortunately
what we were doing was not enough in all cases.
Just be explicit, and don't let anything else mess with the state.

https://bugzilla.gnome.org/show_bug.cgi?id=688895
This commit is contained in:
Giovanni Campagna
2012-11-22 21:28:54 +01:00
parent 0b9cdea7d2
commit 81cd1e6c40
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/ui/messageTray.js
View File

@ -2365,6 +2365,7 @@ const MessageTray = new Lang.Class({
}
if (this._notificationRemoved) {
Tweener.removeTweens(this._notificationWidget);
this._notificationWidget.y = this.actor.height;
this._notificationWidget.opacity = 0;
this._notificationState = State.HIDDEN;
@ -2428,10 +2429,10 @@ const MessageTray = new Lang.Class({
if (this._notificationWidget.y < expandedY) {
this._notificationWidget.y = expandedY;
} else if (this._notification.y != expandedY) {
// Remove any other tween that could mess with the state machine
Tweener.removeTweens(this._notificationWidget);
// Tween also opacity here, to override a possible tween that's
// currently hiding the notification. This will ensure that the
// notification is not removed when the onComplete handler for this
// one triggers.
// currently hiding the notification.
this._tween(this._notificationWidget, '_notificationState', State.SHOWN,
{ y: expandedY,
opacity: 255,