Merge lp:~brandontschaefer/unity/fix.885304 into lp:unity

[Brandon Schaefer]

* Fixes the problem where Alt+F1 wouldn't quit key nav mode. Now it toggles

= Problem description =

Alt is used to exit key nav mode (alt+f1), this means if you hit alt+f1 while in keynav mode it exits keynav mode, then starts it again. This is not the toggling effect wanted.

= The fix =

If alt + <anykey> is pressed then exit keynav mode.
Also if the hud is about to show exit keynav mode

= Test coverage =

There is an autopilot test for this

[Tim Penhey (thumper)]

The code looks fine, we should get some autopilot tests around it :)

[Thomi Richards (thomir-deactivatedaccount)]

Autopilot test looks awesome.

review: Approve

[Thomi Richards (thomir-deactivatedaccount)]

+1

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-03-14 23:22:02 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-16 04:20:27 +0000
@@ -1146,11 +1146,10 @@
       parent_->KeyNavNext();
       break;
 
-      // super/control/alt/esc/left (close quicklist or exit laucher key-focus)
+      // super/control/esc/left (close quicklist or exit laucher key-focus)
     case NUX_VK_LWIN:
     case NUX_VK_RWIN:
     case NUX_VK_CONTROL:
-    case NUX_VK_MENU:
     case NUX_VK_LEFT:
     case NUX_KP_LEFT:
     case NUX_VK_ESCAPE:
@@ -1187,6 +1186,11 @@
     break;
 
     default:
+      // ALT + <Anykey>; treat it as a shortcut and exit keynav 
+      if (state & nux::NUX_STATE_ALT)
+      {
+        parent_->KeyNavTerminate(false);
+      }
       break;
   }
 }

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-14 13:05:59 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-16 04:20:27 +0000
@@ -1947,6 +1947,11 @@
   }
   else
   {
+    // Handles closing KeyNav (Alt+F1) if the hud is about to show
+    if (launcher_controller_->KeyNavIsActive())
+    {
+      launcher_controller_->KeyNavTerminate(false);
+    }
     hud_controller_->ShowHud();
   }
 

=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-03-15 19:39:31 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-03-16 04:20:27 +0000
@@ -395,6 +395,38 @@
         self.assertThat(self.launcher.key_nav_is_active, Equals(True))
         self.assertThat(self.launcher.key_nav_is_grabbed, Equals(True))
 
+    def test_launcher_keynav_mode_toggles(self):
+        """Tests that keynav mode toggles with Alt+F1."""
+        launcher_instance = self.get_launcher()
+
+        launcher_instance.key_nav_start()
+        launcher_instance.key_nav_start()
+                                                    
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
+
+    def test_launcher_keynav_alt_tab_quits(self):
+        """Tests that alt+tab exits keynav mode."""
+        launcher_instance = self.get_launcher()
+        launcher_instance.key_nav_start()
+
+        self.switcher.initiate()
+        sleep(1)
+        self.switcher.stop()
+
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
+
+    def test_launcher_keynav_alt_grave_quits(self):
+        """Tests that alt+` exits keynav mode."""
+        launcher_instance = self.get_launcher()
+        launcher_instance.key_nav_start()
+
+        self.switcher.initiate_detail_mode()
+        sleep(1)
+        self.switcher.stop()
+
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
+
+
 class LauncherRevealTests(ScenariodLauncherTests):
     """Test the launcher reveal bahavior when in autohide mode."""