Merge lp:~brandontschaefer/unity/disable-alt-f1-hud into lp:unity

[Brandon Schaefer]

Disable Alt+F1 mode in the hud

== Problem ==
Alt+F1 works when the hud is open

== Fix ==
Disable Alf+F1 mode when the hud is open

== Test ==
Autopilot test

[Thomi Richards (thomir)]

Looks good.

review: Approve

[Brandon Schaefer (brandontschaefer)]

https://code.launchpad.net/~unity-team/unity/fixes.unityshell-overlay/+merge/99462

End up having to do a lot more work of here. So reject this branch!

Unmerged revisions

2172. By Brandon Schaefer on 2012-03-27

* Disable Alt+F1 mode in the hud

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-26 21:52:33 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-27 01:35:22 +0000
@@ -1340,7 +1340,7 @@
 #ifndef USE_GLES
       cScreen->damageScreen();  // evil hack
 #endif
-      if (_key_nav_mode_requested && !dash_is_open_)
+      if (_key_nav_mode_requested && !dash_is_open_ && !hud_controller_->IsVisible())
         launcher_controller_->KeyNavGrab();
       _key_nav_mode_requested = false;
       break;

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-03-21 14:44:41 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-03-27 01:35:22 +0000
@@ -211,3 +211,11 @@
         contents = open("/tmp/autopilot_gedit_undo_test_temp_file.txt").read().strip('\n')
         self.assertEqual("0 ", contents)
 
+    def test_disabled_alt_f1(self):
+        """This test shows that Alt+F1 mode is disabled for the hud."""
+        self.hud.toggle_reveal()
+
+        launcher = self.launcher.get_launcher_for_monitor(0)
+        launcher.key_nav_start()
+
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))