Merge lp:~townsend/compiz/fix-vertical-maximize-normal into lp:compiz/0.9.11

[Christopher Townsend]

Fix issues where vertically maximizing windows by dragging the grab area using Normal mode would result in:
* Incorrect restored window size.
* Wrong window size when vertically maximized, especially when resizing from the bottom of the window.

Fix issues where vertically maximizing windows by dragging the grab area using Normal mode would result in:
* Incorrect restored window size.
* Wrong window size when vertically maximized, especially when resizing from the bottom of the window.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3841
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/48/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/48/rebuild

review: Needs Fixing (continuous-integration)

[lp:~townsend/compiz/fix-vertical-maximize-normal]

3842. By Christopher Townsend on 2014-03-12

Fix logic test to account for the new saveWc & saveMask implementations.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3842
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/49/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Cool, it works like a charm and code looks good.

review: Approve

=== modified file 'plugins/resize/src/logic/include/window-interface.h'
--- plugins/resize/src/logic/include/window-interface.h	2012-12-10 03:28:47 +0000
+++ plugins/resize/src/logic/include/window-interface.h	2014-03-12 19:06:58 +0000
@@ -74,6 +74,8 @@
 	virtual int outputDevice () = 0;
 	virtual const CompSize serverSize () const = 0;
 	virtual void maximize (unsigned int state = 0) = 0;
+	virtual XWindowChanges & saveWc () = 0;
+	virtual int & saveMask () = 0;
 
 	/* equivalent of CompMatch::evaluate  */
 	virtual bool evaluate (CompMatch &match) = 0;
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2013-05-12 09:39:45 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2014-03-12 19:06:58 +0000
@@ -1442,12 +1442,20 @@
 	    {
 		w->maximize (CompWindowStateMaximizedVertMask);
 
-		xwc.x      = geometryWithoutVertMax.x;
-		xwc.y      = geometryWithoutVertMax.y;
-		xwc.width  = geometryWithoutVertMax.width;
-		xwc.height = geometryWithoutVertMax.height;
+		xwc.x      = geometry.x;
+		xwc.y      = geometry.y;
+		xwc.width  = geometry.width;
+		xwc.height = geometry.height;
 
 		mask = CWX | CWY | CWWidth | CWHeight;
+
+		/* Once vertically maximized, save the original window y & height
+		 * geometry, so restoring the window will result in the correct size */
+		w->saveWc ().y = savedGeometry.y;
+		w->saveWc ().height = savedGeometry.height + (w->border ().top +
+							      w->border ().bottom);
+
+		w->saveMask () = CWY | CWHeight;
 	    }
 	}
 	else
 
=== modified file 'plugins/resize/src/logic/tests/mock-window.h'
--- plugins/resize/src/logic/tests/mock-window.h	2012-08-16 14:04:59 +0000
+++ plugins/resize/src/logic/tests/mock-window.h	2014-03-12 19:06:58 +0000
@@ -69,6 +69,8 @@
     MOCK_METHOD0(outputDevice, int());
     MOCK_CONST_METHOD0(serverSize, const CompSize());
     MOCK_METHOD1(maximize, void(unsigned int state));
+    MOCK_METHOD0(saveWc, XWindowChanges &());
+    MOCK_METHOD0(saveMask, int &());
     MOCK_METHOD1(evaluate, bool(CompMatch &match));
 
     MOCK_METHOD0(getResizeInterface, ResizeWindowInterface*());
 
=== modified file 'plugins/resize/src/logic/tests/test-logic.cpp'
--- plugins/resize/src/logic/tests/test-logic.cpp	2013-01-09 05:30:46 +0000
+++ plugins/resize/src/logic/tests/test-logic.cpp	2014-03-12 19:06:58 +0000
@@ -97,6 +97,17 @@
 	EXPECT_CALL (mockWindow, border ())
 	    .WillRepeatedly (ReturnRef (mockWindowBorder));
 
+        mockSaveWc.x = 1;
+        mockSaveWc.y = 2;
+        mockSaveWc.width = 3;
+        mockSaveWc.height = 4; 
+	EXPECT_CALL (mockWindow, saveWc ())
+	    .WillRepeatedly (ReturnRef (mockSaveWc));
+
+        mockSaveMask = 1;
+	EXPECT_CALL (mockWindow, saveMask ())
+	    .WillRepeatedly (ReturnRef (mockSaveMask));
+
 	EXPECT_CALL (mockWindow, grabNotify (_,_,_,_))
 	    .Times(AnyNumber());
 
@@ -202,6 +213,8 @@
     CompWindow::Geometry mockWindowServerGeometry;
     unsigned int mockWindowState;
     CompWindowExtents mockWindowBorder;
+    XWindowChanges mockSaveWc;
+    int mockSaveMask;
 };
 
 
 
=== modified file 'plugins/resize/src/window-impl.h'
--- plugins/resize/src/window-impl.h	2013-01-08 09:17:25 +0000
+++ plugins/resize/src/window-impl.h	2014-03-12 19:06:58 +0000
@@ -201,6 +201,16 @@
 	    mImpl->maximize (state);
 	}
 
+	virtual XWindowChanges & saveWc ()
+	{
+	    return mImpl->saveWc ();
+	}
+
+	virtual int & saveMask ()
+	{
+	    return mImpl->saveMask ();
+	}
+
 	virtual bool evaluate (CompMatch &match)
 	{
 	    return match.evaluate (mImpl);