[beryl-commits] compiz mirror: Changes to 'master' (9720213d74ca7e13ee7f8b925985cd5ad4446eca)

[compiz at server.beryl-project.org]

New commits:
commit 9720213d74ca7e13ee7f8b925985cd5ad4446eca
Merge: 8f9f119dabaf7db9f549ca9f8b0ae1e6a266d6ad 97cefbc9ef1d2afa60c9b0f2c14d19c5978d0f20
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat Jun 9 13:32:56 2007 +0200

    Merge branch 'master' of git+ssh://maniac@git.freedesktop.org/git/xorg/app/compiz

commit 8f9f119dabaf7db9f549ca9f8b0ae1e6a266d6ad
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat Jun 9 13:32:06 2007 +0200

    Terminate scale mode when the last scaled window was closed.


 plugins/scale.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)


Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -1477,6 +1477,27 @@ scaleWindowRemove (CompDisplay *d,
 			damageScreen (w->screen);
 			break;
 		    }
+		    else
+		    {
+			CompOption o;
+			CompAction *action;
+			int        opt;
+
+			SCALE_DISPLAY (d);
+
+			/* terminate scale mode if the recently closed
+			 * window was the last scaled window */
+
+			opt = SCALE_DISPLAY_OPTION_INITIATE;
+			action = &sd->opt[opt].value.action;
+
+			o.type    = CompOptionTypeInt;
+			o.name    = "root";
+			o.value.i = w->screen->root;
+			
+			scaleTerminate (d, action, 0, &o, 1);
+			break;
+		    }
 		}
 	    }
 	}