Merge lp:~compiz-team/compiz/compiz.fix_1093757 into lp:compiz/0.9.9

[Sam Spilsbury]

Resize grid resize state on maximization. We're not grid-resized anymore once maximized. (LP: #1093757)

Resize grid resize state on maximization. We're not grid-resized anymore once maximized. (LP: #1093757).

Not sure about the best way to autotest this. It will require substantial refactoring of surrounding code.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3535
http://jenkins.qa.ubuntu.com/job/compiz-ci/338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/338/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/338//rebuild/?

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Verified the bug is fixed by this.

review: Approve

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2012-11-18 12:18:19 +0000
+++ plugins/grid/src/grid.cpp	2013-01-03 15:49:23 +0000
@@ -917,6 +917,10 @@
     else if (!(lastState & MAXIMIZE_STATE) &&
 	     window->state () & MAXIMIZE_STATE)
     {
+	/* Unset grid resize state */
+	isGridResized = false;
+	resizeCount = 0;
+
 	if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
 	    lastTarget = GridMaximize;
 	if (window->grabbed ())