Merge lp:~brandontschaefer/unity/lp.1231679-fix into lp:unity

[Brandon Schaefer]

If we are switching view ports tell nux to process the events. Even though the viewport switcher does grab the mouse, we will still feed nux the events so we can correctly update where the mouse is for the launcher

If we are switching view ports tell nux to process the events. Even though the viewport switcher does grab the mouse, we will still feed nux the events so we can correctly update where the mouse is for the launcher

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3537
http://jenkins.qa.ubuntu.com/job/unity-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/288

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/400/rebuild

review: Approve (continuous-integration)

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

nice

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-09-24 20:18:42 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-09-26 22:46:23 +0000
@@ -1695,7 +1695,10 @@
       break;
   }
 
-  if (!skip_other_plugins && !switcher_controller_->IsMouseDisabled() &&
+  if (switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible())
+    skip_other_plugins = true;
+
+  if (!skip_other_plugins &&
       screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))
   {
     wt->ProcessForeignEvent(event, nullptr);