Merge lp:~brandontschaefer/unity/dash-closes-when-alt+f1 into lp:unity

[Brandon Schaefer]

Alt+F1 now closes the dash when activated.

=== Problem ===
Alt+F1 was disabled when the Dash was open.

=== Fix ===
Re-enable it, there was also a problem with WindowFocus code where it would quit out of Alt+F1 every other time. This was because when the overlay was open it would send two focus changes which would mess the toggle up.

=== Test ===
AP Tests

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

Code looks good, works ok!

review: Approve

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-06-21 21:04:48 +0000
+++ launcher/LauncherController.cpp	2012-06-29 22:19:20 +0000
@@ -372,6 +372,9 @@
 {
   static bool keynav_first_focus = false;
 
+  if (parent_->IsOverlayOpen())
+    keynav_first_focus = false;
+
   if (keynav_first_focus)
   {
     keynav_first_focus = false;
@@ -1097,7 +1100,6 @@
 
 void Controller::KeyNavGrab()
 {
-  pimpl->ubus.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
   pimpl->launcher_grabbed = true;
   KeyNavActivate();
   pimpl->keyboard_launcher_->GrabKeyboard();

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-06-27 23:51:31 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-29 22:19:20 +0000
@@ -1369,8 +1369,14 @@
 #ifndef USE_MODERN_COMPIZ_GL
       cScreen->damageScreen();  // evil hack
 #endif
-      if (_key_nav_mode_requested && !launcher_controller_->IsOverlayOpen())
+      if (_key_nav_mode_requested)
+      {
+        if (launcher_controller_->IsOverlayOpen())
+        {
+          dash_controller_->HideDash();
+        }
         launcher_controller_->KeyNavGrab();
+      }
       _key_nav_mode_requested = false;
       break;
     case ButtonPress:

=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
--- tests/autopilot/unity/tests/launcher/test_keynav.py	2012-06-22 02:33:38 +0000
+++ tests/autopilot/unity/tests/launcher/test_keynav.py	2012-06-29 22:19:20 +0000
@@ -180,3 +180,12 @@
         self.start_keynav_with_cleanup_cancel()
         self.keyboard.press_and_release("Escape")
         self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
+    def test_alt_f1_closes_dash(self):
+        """This test when Alt+F1 is activated it must close the dash."""
+        self.dash.ensure_visible()
+
+        self.start_keynav_with_cleanup_cancel()
+
+        self.assertThat(self.dash.visible, Equals(False))
+        self.assertThat(self.launcher.key_nav_is_active, Equals(True))

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-06-26 18:18:19 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-06-29 22:19:20 +0000
@@ -271,16 +271,6 @@
         category = lens.get_focused_category()
         self.assertIsNot(category, None)
 
-    def test_alt_f1_disabled(self):
-        """This test that Alt+F1 is disabled when the dash is opened."""
-        self.dash.ensure_visible()
-        # can't use launcher emulator since we'll fail to start keynav:
-        self.keybinding("launcher/keynav")
-        # can't use Eventually here - sleep long enough for the launcher controller
-        # to react to the keypress (well, hopefully not)
-        sleep(5)
-        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
-
 
 class DashClipboardTests(DashTestCase):
     """Test the Unity clipboard"""