Merge lp:~compiz-team/compiz-core/compiz-core.fix_716521 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix bug 716521

[Jason Smith (jassmith)]

review: Approve

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-09-27 11:54:45 +0000
+++ plugins/decor/src/decor.cpp	2011-09-28 12:38:13 +0000
@@ -2772,6 +2772,10 @@
     {
 	if (wd && wd->decor)
 	{
+	    int oldShiftX = shiftX ();
+	    int oldShiftY = shiftY ();
+	    int moveDx, moveDy;
+
 	    if ((window->state () & MAXIMIZE_STATE) == MAXIMIZE_STATE)
 		window->setWindowFrameExtents (&wd->decor->maxBorder,
 					       &wd->decor->maxInput);
@@ -2779,6 +2783,20 @@
 		window->setWindowFrameExtents (&wd->decor->border,
 					       &wd->decor->input);
 
+	    /* Since we immediately update the frame extents, we must
+	     * also update the stored saved window geometry in order
+	     * to prevent the window from shifting back too far once
+	     * unmaximized */
+
+	    moveDx = shiftX () - oldShiftX;
+	    moveDy = shiftY () - oldShiftY;
+
+	    if (window->saveMask () & CWX)
+		window->saveWc ().x += moveDx;
+
+	    if (window->saveMask () & CWY)
+		window->saveWc ().y += moveDy;
+
 	    updateFrame ();
 	}
     }