Merge lp:~townsend/compiz/fix-auto-vp-switch into lp:compiz/0.9.11

[Christopher Townsend]

Fix regression when selecting apps on a different viewport than the current one will no longer automatically switch the viewport.

= Issue =
A regression has occurred in which auto switching viewports no longer happens when using global Alt-Tab or selecting an app on the Launcher that is in a different viewport.

= Fix =
Be more smart about when to check for the optionGetAutoSwitchVpAndWindow () bool. Now only check in the code block that actually moves the window to a different viewport. This is only a half fix now for bug #1092323. The part of that bug to not switch viewports when the window is > 50% in a different viewport is still not fixed.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2013-08-28 12:18:22 +0000
+++ plugins/wall/src/wall.cpp	2013-09-24 20:34:22 +0000
@@ -553,7 +553,7 @@
 {
     WALL_SCREEN (screen);
 
-    if (ws->optionGetAutoSwitchVpAndWindow () && window->placed () && !screen->otherGrabExist ("wall", "switcher", 0))
+    if (window->placed () && !screen->otherGrabExist ("wall", "switcher", 0))
     {
 	int       dx, dy;
 	CompPoint viewport;
@@ -582,23 +582,26 @@
 		return;
 	    }
 
-	    ws->focusDefault = false;
-
-	    CompRegion screenRegion;
-
-	    foreach (const CompOutput &o, screen->outputDevs ())
-		screenRegion += o.workArea ();
-
-	    CompPoint d = compiz::wall::movementWindowOnScreen (window->serverBorderRect (),
-								screenRegion);
-
-	    mask |= d.x () !=0 ? CWX : 0;
-	    mask |= d.y () !=0 ? CWY : 0;
-
-	    xwc.x = window->serverGeometry ().x () + d.x ();
-	    xwc.y = window->serverGeometry ().y () + d.y ();
-
-	    window->configureXWindow (mask, &xwc);
+	    if (ws->optionGetAutoSwitchVpAndWindow ())
+	    {
+		ws->focusDefault = false;
+
+		CompRegion screenRegion;
+
+		foreach (const CompOutput &o, screen->outputDevs ())
+		    screenRegion += o.workArea ();
+
+		CompPoint d = compiz::wall::movementWindowOnScreen (window->serverBorderRect (),
+								    screenRegion);
+
+		mask |= d.x () !=0 ? CWX : 0;
+		mask |= d.y () !=0 ? CWY : 0;
+
+		xwc.x = window->serverGeometry ().x () + d.x ();
+		xwc.y = window->serverGeometry ().y () + d.y ();
+
+		window->configureXWindow (mask, &xwc);
+	    }
 	}
     }