From be2801d1fa0da23ad97caa8132f1d933bf1907ea Mon Sep 17 00:00:00 2001 From: Leon Handreke Date: Sat, 23 Jan 2010 08:37:34 +0100 Subject: [PATCH] Nicer animation of hidden windows when transitioning to/from the overview Hidden windows used to appear/disappear abruptly in the beginning/end of the transition and the new animation is a lot smoother. https://bugzilla.gnome.org/show_bug.cgi?id=571109 --- js/ui/workspace.js | 53 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/js/ui/workspace.js b/js/ui/workspace.js index e8d69dfb4..8afd94c0f 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -993,6 +993,26 @@ Workspace.prototype = { overlay.hide(); if (animate) { + if (!metaWindow.showing_on_its_workspace()) { + /* Hidden windows should fade in and grow + * therefore we need to resize them now so they + * can be scaled up later */ + if (workspaceZooming) { + clone.actor.opacity = 0; + clone.actor.scale_x = 0; + clone.actor.scale_y = 0; + clone.actor.x = x; + clone.actor.y = y; + } + + // Make the window slightly transparent to indicate it's hidden + Tweener.addTween(clone.actor, + { opacity: 255, + time: Overview.ANIMATION_TIME, + transition: "easeInQuad" + }); + } + Tweener.addTween(clone.actor, { x: x, y: y, @@ -1162,16 +1182,29 @@ Workspace.prototype = { // Position and scale the windows. for (let i = 1; i < this._windows.length; i++) { let clone = this._windows[i]; - Tweener.addTween(clone.actor, - { x: clone.origX, - y: clone.origY, - scale_x: 1.0, - scale_y: 1.0, - workspace_relative: this, - time: Overview.ANIMATION_TIME, - opacity: 255, - transition: "easeOutQuad" - }); + + if (clone.metaWindow.showing_on_its_workspace()) { + Tweener.addTween(clone.actor, + { x: clone.origX, + y: clone.origY, + scale_x: 1.0, + scale_y: 1.0, + workspace_relative: this, + time: Overview.ANIMATION_TIME, + opacity: 255, + transition: "easeOutQuad" + }); + } else { + // The window is hidden, make it shrink and fade it out + Tweener.addTween(clone.actor, + { scale_x: 0, + scale_y: 0, + opacity: 0, + workspace_relative: this, + time: Overview.ANIMATION_TIME, + transition: "easeOutQuad" + }); + } } this._visible = false;