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

Revert "wip: cross fade the window_group and window clones going in/out of the overview"

Browse Source 
This reverts commit 162559159827227d418afd1f712f79c1d3a4a353.
This commit is contained in:
Rui Matos 2011-07-20 00:45:53 +01:00
parent d894dedaf6
commit 361308eb1b
2 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/overview.js
View File

@ -535,15 +535,7 @@ Overview.prototype = {
// //
// If we switched to displaying the actors in the Overview rather than // If we switched to displaying the actors in the Overview rather than
// clones of them, this would obviously no longer be necessary. // clones of them, this would obviously no longer be necessary.
global.window_group.hide();
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(); }
});
this._group.show(); this._group.show();
this._background.show(); this._background.show();
@ -672,14 +664,6 @@ Overview.prototype = {
this.animationInProgress = true; this.animationInProgress = true;
this._hideInProgress = 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()) { if (!this.workspaces.getActiveWorkspace().hasMaximizedWindows()) {
this._desktopFade.opacity = 0; this._desktopFade.opacity = 0;
this._desktopFade.show(); this._desktopFade.show();
@ -720,6 +704,8 @@ Overview.prototype = {
}, },
_hideDone: function() { _hideDone: function() {
global.window_group.show();
this.workspaces.destroy(); this.workspaces.destroy();
this.workspaces = null; this.workspaces = null;

37
js/ui/workspace.js
View File

@ -973,28 +973,17 @@ Workspace.prototype = {
}); });
} }
clone.actor.opacity = 0;
Tweener.addTween(clone.actor, Tweener.addTween(clone.actor,
{ opacity: 255, { x: x,
y: y,
scale_x: scale,
scale_y: scale,
time: Overview.ANIMATION_TIME, time: Overview.ANIMATION_TIME,
transition: 'easeInOutQuad', transition: 'easeOutQuad',
onComplete: Lang.bind(this, function() { onComplete: Lang.bind(this, function() {
this._showWindowOverlay(clone, overlay, true); 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 { } else {
clone.actor.set_position(x, y); clone.actor.set_position(x, y);
clone.actor.set_scale(scale, scale); clone.actor.set_scale(scale, scale);
@ -1259,18 +1248,14 @@ Workspace.prototype = {
if (clone.metaWindow.showing_on_its_workspace()) { if (clone.metaWindow.showing_on_its_workspace()) {
Tweener.addTween(clone.actor, Tweener.addTween(clone.actor,
{ opacity: 0, { x: clone.origX,
y: clone.origY,
scale_x: 1.0,
scale_y: 1.0,
time: Overview.ANIMATION_TIME, 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 { } else {
// The window is hidden, make it shrink and fade it out // The window is hidden, make it shrink and fade it out
Tweener.addTween(clone.actor, Tweener.addTween(clone.actor,