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

[Brandon Schaefer]

Disable Alt+F1 mode when the dash is open.

== Problem ==
Alt+F1 works when the dash is open, this gets you stuck in that state when you keep trying to go into Alt+F1 mode

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

== Test ==
Autopilot test

[Tim Penhey (thumper)]

What happens if the hud is open?

[Thomi Richards (thomir)]

Looks good to me.

review: Approve

[Brandon Schaefer (brandontschaefer)]

If the hud is open it will either start Alt+F1 correctly or it just closes the hud, Ill also add update so it is disabled for the hud!

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

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-03-22 10:00:50 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-03-26 22:30:25 +0000
@@ -301,6 +301,15 @@
         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()
+
+        launcher = self.launcher.get_launcher_for_monitor(0)
+        launcher.key_nav_start()
+        
+        self.assertThat(self.launcher.key_nav_is_active, Equals(False))
+        
 
 class DashClipboardTests(DashTestCase):
     """Test the Unity clipboard"""