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

tweener: remove tweens when target.actor is destroyed

Browse Source 
We already remove tweens automatically when a Clutter actor is destroyed;
do the same when the target is a JS delegate with an actor property.

https://bugzilla.gnome.org/show_bug.cgi?id=642925
This commit is contained in:
Owen W. Taylor 2011-02-22 09:25:48 -05:00
parent 5683bb9b8e
commit 192d3a94ed
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/tweener.js
View File

@ -62,9 +62,16 @@ function addTween(target, tweeningParameters) {
function _wrapTweening(target, tweeningParameters) { function _wrapTweening(target, tweeningParameters) {
let state = _getTweenState(target); let state = _getTweenState(target);
if (target instanceof Clutter.Actor && !state.destroyedId) if (!state.destroyedId) {
state.destroyedId = target.connect('destroy', _actorDestroyed); if (target instanceof Clutter.Actor) {
state.actor = target;
state.destroyedId = target.connect('destroy', _actorDestroyed);
} else if (target.actor && target.actor instanceof Clutter.Actor) {
state.actor = target.actor;
state.destroyedId = target.actor.connect('destroy', function() { _actorDestroyed(target); });
}
}
_addHandler(target, tweeningParameters, 'onStart', _tweenStarted); _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
_addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted); _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
} }
@ -82,7 +89,7 @@ function _resetTweenState(target) {
if (state) { if (state) {
if (state.destroyedId) if (state.destroyedId)
target.disconnect(state.destroyedId); state.actor.disconnect(state.destroyedId);
if (state.idleCompletedId) if (state.idleCompletedId)
Mainloop.source_remove(state.idleCompletedId); Mainloop.source_remove(state.idleCompletedId);
} }