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

Revert "windowManager: Update animation of attached modals"

Browse Source 
This reverts commit 6ab25cd791.

https://bugzilla.gnome.org/show_bug.cgi?id=681601
This commit is contained in:
Florian Müllner 2012-08-10 15:18:40 +02:00
parent ca7c4edd41
commit aaf61cbbbe
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/ui/windowManager.js
View File

@ -299,12 +299,28 @@ const WindowManager = new Lang.Class({
})); }));
if (actor.meta_window.is_attached_dialog()) { if (actor.meta_window.is_attached_dialog()) {
this._checkDimming(actor.get_meta_window().get_transient_for()); this._checkDimming(actor.get_meta_window().get_transient_for());
if (this._shouldAnimate()) {
actor.set_scale(1.0, 0.0);
actor.show();
this._mapping.push(actor);
if (!this._shouldAnimate()) { Tweener.addTween(actor,
shellwm.completed_map(actor); { scale_y: 1,
time: WINDOW_ANIMATION_TIME,
transition: "easeOutQuad",
onComplete: this._mapWindowDone,
onCompleteScope: this,
onCompleteParams: [shellwm, actor],
onOverwrite: this._mapWindowOverwrite,
onOverwriteScope: this,
onOverwriteParams: [shellwm, actor]
});
return; return;
} }
} else if (!this._shouldAnimateActor(actor)) { shellwm.completed_map(actor);
return;
}
if (!this._shouldAnimateActor(actor)) {
shellwm.completed_map(actor); shellwm.completed_map(actor);
return; return;
} }
@ -360,7 +376,7 @@ const WindowManager = new Lang.Class({
return; return;
} }
actor.opacity = 255; actor.set_scale(1.0, 1.0);
actor.show(); actor.show();
this._destroying.push(actor); this._destroying.push(actor);
@ -370,7 +386,7 @@ const WindowManager = new Lang.Class({
})); }));
Tweener.addTween(actor, Tweener.addTween(actor,
{ opacity: 0, { scale_y: 0,
time: WINDOW_ANIMATION_TIME, time: WINDOW_ANIMATION_TIME,
transition: "easeOutQuad", transition: "easeOutQuad",
onComplete: this._destroyWindowDone, onComplete: this._destroyWindowDone,