Merge lp:~sjakthol/compiz/fix-776435 into lp:compiz/0.9.10

[Sami Jaktholm]

Bias the current viewport in addWindowSizeChanges.

If window is visible in the current viewport, use that viewport when
calculating geometries in addWindowSizeChanges. Otherwise the current method
is used.

This way visible windows are maximized in the current viewport.
However, offscreen windows won't jump back to the active viewport if window
maximizes by itself or addWindowSizeChanges is called for some other reason.

I've been using this for few days and haven't seen anything out of place. Windows don't seem to be jumping around like with the last fix for this bug.

[Sam Spilsbury (smspillaz)]

This makes sense to me - anybody else got any other opinions?

review: Approve

[Brandon Schaefer (brandontschaefer)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[MC Return (mc-return)]

Yippie !!!

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-07-19 04:15:01 +0000
+++ src/window.cpp	2013-07-19 06:39:23 +0000
@@ -3553,7 +3553,10 @@
     int       mask = 0;
     CompPoint viewport;
 
-    screen->viewportForGeometry (old, viewport);
+    if (old.intersects (CompRect (0, 0, screen->width (), screen->height ())))
+	viewport = screen->vp ();
+    else
+	screen->viewportForGeometry (old, viewport);
 
     int x = (viewport.x () - screen->vp ().x ()) * screen->width ();
     int y = (viewport.y () - screen->vp ().y ()) * screen->height ();