Merge lp:~robertcarr/unity/dash-keepfocus into lp:unity

[Robert Carr]

Don't let windows steal focus from the dash if it is open. Closes lp:830730 (https://bugs.launchpad.net/unity/+bug/830730)

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-15 12:05:46 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-16 14:19:24 +0000
@@ -1593,6 +1593,19 @@
 {
   PluginAdapter::Default()->Notify(window, n);
   window->windowNotify(n);
+  
+  // We do this after the notify to ensure input focus has actually been moved.
+  if (n == CompWindowNotifyFocusChange)
+  {
+    UnityScreen* us = UnityScreen::get(screen);
+    CompWindow *lw;
+    
+    if (us->dash_is_open_)
+    {
+      lw = screen->findWindow(us->launcherWindow->GetInputWindowId());
+      lw->moveInputFocusTo();
+    }
+  }
 }
 
 void UnityWindow::stateChangeNotify(unsigned int lastState)