[fusion-commits] Animation plugin: Changes to 'master' (7c3267efbb52b8112b3a97142122f268610325da)

[cornelius at server.opencompositing.org]

New commits:
commit 7c3267efbb52b8112b3a97142122f268610325da
Merge: 25f20f4fc835ed6bf189f3a7358adc0c667cdb25 4d561a915be1fdbb8835b1fdd57b0b68a2031771
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun Mar 16 23:08:50 2008 -0500

    Merge branch 'master' of git+ssh://cornelius@git.opencompositing.org/git/fusion/plugins/animation

commit 25f20f4fc835ed6bf189f3a7358adc0c667cdb25
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Sun Mar 16 23:05:37 2008 -0500

    Fix 1st unminimize anim. after compiz (re)start.
    
    Windows that were in minimized state when compiz is (re)started are being
    animated with the open animation instead of the unminimize animation when
    unminimized the first time. This fixes that bug, so that unminimize
    animation is played for such windows on the first unminimize.


 animation.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


Modified: fusion/plugins/animation/animation.c
===================================================================
--- fusion/plugins/animation/animation.c
+++ fusion/plugins/animation/animation.c
@@ -4059,8 +4059,6 @@ static void animWindowResizeNotify(CompWindow * w, int dx, int dy, int dwidth, i
 			 WIN_W(w), WIN_H(w));
     }
 
-    aw->state = w->state;
-
     UNWRAP(as, w->screen, windowResizeNotify);
     (*w->screen->windowResizeNotify) (w, dx, dy, dwidth, dheight);
     WRAP(as, w->screen, windowResizeNotify, animWindowResizeNotify);
@@ -4416,7 +4414,6 @@ static Bool animInitWindow(CompPlugin * p, CompWindow * w)
 	return FALSE;
 
     aw->model = 0;
-    aw->state = w->state;
     aw->animRemainingTime = 0;
     aw->animInitialized = FALSE;
     aw->curAnimEffect = AnimEffectNone;
@@ -4439,7 +4436,13 @@ static Bool animInitWindow(CompPlugin * p, CompWindow * w)
     aw->BB.x1 = aw->BB.y1 = MAXSHORT;
     aw->BB.x2 = aw->BB.y2 = MINSHORT;
 
-    if (w->shaded)
+    aw->nowShaded = FALSE;
+
+    if (w->minimized)
+    {
+	aw->state = aw->newState = IconicState;
+    }
+    else if (w->shaded)
     {
 	aw->state = aw->newState = NormalState;
 	aw->nowShaded = TRUE;
@@ -4447,7 +4450,6 @@ static Bool animInitWindow(CompPlugin * p, CompWindow * w)
     else
     {
 	aw->state = aw->newState = animGetWindowState(w);
-	aw->nowShaded = FALSE;
     }
 
     w->base.privates[as->windowPrivateIndex].ptr = aw;