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

[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

[Jason Smith (jassmith)]

Coolio :)

Like the use of the lambda

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

Looks good to me.

review: Approve (quality)

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-06-15 02:03:31 +0000
+++ launcher/LauncherController.cpp	2012-06-20 20:55:18 +0000
@@ -196,6 +196,7 @@
 
   LauncherList launchers;
 
+  glib::Source::UniquePtr activate_idle_;
   glib::Object<BamfMatcher> matcher_;
   glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
   glib::SourceManager sources_;
@@ -1196,8 +1197,12 @@
                             g_variant_new_boolean(pimpl->keynav_restore_window_));
   }
 
-  if (activate)
-    pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+  pimpl->activate_idle_.reset(new glib::Idle([&] () {
+    if (activate)
+      pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+
+    return false;
+  }));
 
   pimpl->launcher_keynav = false;
   if (!pimpl->launcher_open)

=== modified file 'tests/autopilot/unity/tests/test_launcher.py'
--- tests/autopilot/unity/tests/test_launcher.py	2012-06-18 05:20:12 +0000
+++ tests/autopilot/unity/tests/test_launcher.py	2012-06-20 20:55:18 +0000
@@ -378,6 +378,29 @@
         self.assertTrue(calc.is_active)
         self.assertFalse(mahjongg.is_active)
 
+    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")))
+
+    def test_launcher_keynav_expo_exit_on_esc(self):
+        """Esc should quit expo when entering it from KeyNav."""
+
+        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.keyboard.press_and_release("Escape")
+        self.assertThat(self.window_manager.expo_active, Eventually(Equals(False)))
+
     def test_launcher_keynav_alt_tab_quits(self):
         """Tests that alt+tab exits keynav mode."""