Merge lp:~brandontschaefer/unity/keynav-alt+f1-expo-fix-SRU into lp:unity/5.0

[Brandon Schaefer]

Fixes focus problem when entering expo mode from KeyNav(Alt+F1).

=== Problem ===

When KeyNav would terminate it would activate the launcher icon before restoring input focus. This means in Alt+F1 mode the screen was still grabbed causing the focus in expo mode to fail. This was caused by a ubus message race condition.

=== Fix ===

Added a GLib::Idle fucntion for the activation, so the ubus call has time to finish before activating the icon.

=== Test ===

AP test included

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

+1

review: Approve

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-05-24 17:14:26 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-06-21 17:36:00 +0000
@@ -1197,7 +1197,13 @@
   }
 
   if (activate)
-    pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+  {
+    g_idle_add([] (gpointer data) -> gboolean {
+      Controller *self = (Controller*)data;
+        self->pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+      return FALSE;
+    }, this);
+  }
 
   pimpl->launcher_keynav = false;
   if (!pimpl->launcher_open)

=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-06-18 16:25:00 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-06-21 17:36:00 +0000
@@ -258,9 +258,9 @@
         self.launcher_instance.key_nav_start()
 
     def tearDown(self):
-        super(LauncherKeyNavTests, self).tearDown()
         if self.launcher.key_nav_is_active:
             self.launcher_instance.key_nav_cancel()
+        super(LauncherKeyNavTests, self).tearDown()
 
     def test_launcher_keynav_initiate(self):
         """Tests we can initiate keyboard navigation on the launcher."""
@@ -382,6 +382,16 @@
         self.addCleanup(self.switcher.terminate)
         self.assertThat(self.launcher.key_nav_is_active, Eventually(Equals(False)))
 
+    def test_launcher_keynav_expo_focus(self):
+        """When entering expo mode from KeyNav the Desktop must get focus."""
+
+        for icon in self.launcher.model.get_launcher_icons_for_monitor(self.launcher_monitor):
+            if (icon.tooltip_text == "Workspace Switcher"):
+                self.launcher_instance.key_nav_activate()
+                break
+            self.launcher_instance.key_nav_next()
+
+        self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Ubuntu Desktop")))
 
 class LauncherIconsBehaviorTests(LauncherTestCase):
     """Test the launcher icons interactions"""