[gnome-shell] Revert "windowManager: Update animation of attached modals"
- From: Florian MÃllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Revert "windowManager: Update animation of attached modals"
- Date: Thu, 16 Aug 2012 07:53:06 +0000 (UTC)
commit aaf61cbbbe934743e51ccf16e4f661c4adac8436
Author: Florian MÃllner <fmuellner gnome org>
Date: Fri Aug 10 15:18:40 2012 +0200
Revert "windowManager: Update animation of attached modals"
This reverts commit 6ab25cd7912a623151d0d6aa5876cd6de1987ea9.
https://bugzilla.gnome.org/show_bug.cgi?id=681601
js/ui/windowManager.js | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index c809c0a..c535fef 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -299,12 +299,28 @@ const WindowManager = new Lang.Class({
}));
if (actor.meta_window.is_attached_dialog()) {
this._checkDimming(actor.get_meta_window().get_transient_for());
-
- if (!this._shouldAnimate()) {
- shellwm.completed_map(actor);
+ if (this._shouldAnimate()) {
+ actor.set_scale(1.0, 0.0);
+ actor.show();
+ this._mapping.push(actor);
+
+ Tweener.addTween(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;
}
- } else if (!this._shouldAnimateActor(actor)) {
+ shellwm.completed_map(actor);
+ return;
+ }
+ if (!this._shouldAnimateActor(actor)) {
shellwm.completed_map(actor);
return;
}
@@ -360,7 +376,7 @@ const WindowManager = new Lang.Class({
return;
}
- actor.opacity = 255;
+ actor.set_scale(1.0, 1.0);
actor.show();
this._destroying.push(actor);
@@ -370,7 +386,7 @@ const WindowManager = new Lang.Class({
}));
Tweener.addTween(actor,
- { opacity: 0,
+ { scale_y: 0,
time: WINDOW_ANIMATION_TIME,
transition: "easeOutQuad",
onComplete: this._destroyWindowDone,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]