[fusion-commits] compiz mirror: Changes to 'master' (c5261548a0b04189ab84470fe6d3aa331eda3243)

[compiz at server.beryl-project.org]

New commits:
commit c5261548a0b04189ab84470fe6d3aa331eda3243
Author: Erkin Bahceci <erkinbah at gmail.com>
Date:   Wed Jul 11 04:22:42 2007 -0400

    Fix timing of scale activate event ending.


 plugins/scale.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -928,7 +928,13 @@ scaleDonePaintScreen (CompScreen *s)
 	else
 	{
 	    if (ss->state == SCALE_STATE_IN)
+	    {
+		/* The FALSE activate event is sent when scale state
+		   goes back to normal, to avoid animation conflicts
+		   with other plugins. */
+		scaleActivateEvent (s, FALSE);
 		ss->state = SCALE_STATE_NONE;
+	    }
 	    else if (ss->state == SCALE_STATE_OUT)
 		ss->state = SCALE_STATE_WAIT;
 	}
@@ -1051,8 +1057,6 @@ scaleTerminate (CompDisplay     *d,
 		ss->grabIndex = 0;
 	    }
 
-	    scaleActivateEvent (s, FALSE);
-
 	    if (ss->dndTarget)
 		XUnmapWindow (d->display, ss->dndTarget);