[gnome-shell] Revert "wip: cross fade the window_group and window clones going in/out of the overview"
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Revert "wip: cross fade the window_group and window clones going in/out of the overview"
- Date: Tue, 19 Jul 2011 23:47:24 +0000 (UTC)
commit 361308eb1be6dd8d6c8a2d2af1f4e7e6c382471c
Author: Rui Matos <tiagomatos gmail com>
Date: Wed Jul 20 00:45:53 2011 +0100
Revert "wip: cross fade the window_group and window clones going in/out of the overview"
This reverts commit 162559159827227d418afd1f712f79c1d3a4a353.
js/ui/overview.js | 20 +++-----------------
js/ui/workspace.js | 37 +++++++++++--------------------------
2 files changed, 14 insertions(+), 43 deletions(-)
---
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 37c90c3..085f292 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -535,15 +535,7 @@ Overview.prototype = {
//
// If we switched to displaying the actors in the Overview rather than
// clones of them, this would obviously no longer be necessary.
-
- global.window_group.raise(global.overlay_group);
- Tweener.addTween(global.window_group,
- { opacity: 0,
- time: ANIMATION_TIME,
- transition: 'easeInOutQuad',
- onComplete: function() { global.window_group.hide(); }
- });
-
+ global.window_group.hide();
this._group.show();
this._background.show();
@@ -672,14 +664,6 @@ Overview.prototype = {
this.animationInProgress = true;
this._hideInProgress = true;
- global.window_group.raise(global.overlay_group);
- global.window_group.show();
- Tweener.addTween(global.window_group,
- { opacity: 255,
- time: ANIMATION_TIME,
- transition: 'easeInOutQuad'
- });
-
if (!this.workspaces.getActiveWorkspace().hasMaximizedWindows()) {
this._desktopFade.opacity = 0;
this._desktopFade.show();
@@ -720,6 +704,8 @@ Overview.prototype = {
},
_hideDone: function() {
+ global.window_group.show();
+
this.workspaces.destroy();
this.workspaces = null;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 0c17485..e6c65b9 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -973,28 +973,17 @@ Workspace.prototype = {
});
}
- clone.actor.opacity = 0;
Tweener.addTween(clone.actor,
- { opacity: 255,
+ { x: x,
+ y: y,
+ scale_x: scale,
+ scale_y: scale,
time: Overview.ANIMATION_TIME,
- transition: 'easeInOutQuad',
+ transition: 'easeOutQuad',
onComplete: Lang.bind(this, function() {
this._showWindowOverlay(clone, overlay, true);
})
});
- // Tweener.addTween(clone.actor,
- // { x: x,
- // y: y,
- // scale_x: scale,
- // scale_y: scale,
- // time: Overview.ANIMATION_TIME,
- // transition: 'easeInOutQuad',
- // onComplete: Lang.bind(this, function() {
- // this._showWindowOverlay(clone, overlay, true);
- // })
- // });
- clone.actor.set_position(x, y);
- clone.actor.set_scale(scale, scale);
} else {
clone.actor.set_position(x, y);
clone.actor.set_scale(scale, scale);
@@ -1259,18 +1248,14 @@ Workspace.prototype = {
if (clone.metaWindow.showing_on_its_workspace()) {
Tweener.addTween(clone.actor,
- { opacity: 0,
+ { x: clone.origX,
+ y: clone.origY,
+ scale_x: 1.0,
+ scale_y: 1.0,
time: Overview.ANIMATION_TIME,
- transition: 'easeInOutQuad'
+ opacity: 255,
+ transition: 'easeOutQuad'
});
- // Tweener.addTween(clone.actor,
- // { x: clone.origX,
- // y: clone.origY,
- // scale_x: 1.0,
- // scale_y: 1.0,
- // time: Overview.ANIMATION_TIME,
- // transition: 'easeInOutQuad'
- // });
} else {
// The window is hidden, make it shrink and fade it out
Tweener.addTween(clone.actor,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]