Merge lp:~thomir-deactivatedaccount/unity/fix-hud-closing into lp:unity

[Thomi Richards]

Dash and hud now close on Alt+F4 even when the caps lock or num lock keys are active.

Problem:

The dash and the hud are supposed to close on Alt+F4, but this doesn't work if the caps lock or num lock keys are active.

Solution:

This branch fixes that.

Tests:

There are two more autopilot tests that cover this code.

[Tim Penhey (thumper)]

Looks good.

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-07-04 02:37:23 +0000
+++ dash/DashView.cpp	2012-07-10 03:30:31 +0000
@@ -227,7 +227,7 @@
   nux::Geometry const& geo = GetGeometry();
   content_geo_ = GetBestFitGeometry(geo);
   dash::Style& style = dash::Style::Instance();
-  
+
   if (style.always_maximised)
   {
     if (geo.width >= content_geo_.width && geo.height > content_geo_.height)
@@ -460,7 +460,7 @@
   });
 
   // global search done is handled by the home lens, no need to connect to it
-  // BUT, we will special case global search finished coming from 
+  // BUT, we will special case global search finished coming from
   // the applications lens, because we want to be able to launch applications
   // immediately without waiting for the search finished signal which will
   // be delayed by all the lenses we're searching
@@ -766,6 +766,10 @@
                                       unsigned long x11_key_code,
                                       unsigned long special_keys_state)
 {
+  // Only care about states of Alt, Ctrl, Super, Shift, not the lock keys
+  special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |
+                         nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);
+
   // Do what nux::View does, but if the event isn't a key navigation,
   // designate the text entry to process it.
 
 
=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-07-04 02:37:23 +0000
+++ hud/HudView.cpp	2012-07-10 03:30:31 +0000
@@ -565,6 +565,10 @@
       unsigned long x11_key_code,
       unsigned long special_keys_state)
 {
+  // Only care about states of Alt, Ctrl, Super, Shift, not the lock keys
+  special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |
+                         nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);
+
   nux::KeyNavDirection direction = nux::KEY_NAV_NONE;
   switch (x11_key_code)
   {
 
=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2012-07-04 02:37:23 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2012-07-10 03:30:31 +0000
@@ -62,6 +62,15 @@
         self.keyboard.press_and_release("Alt+F4")
         self.assertThat(self.dash.visible, Eventually(Equals(False)))
 
+    def test_alt_f4_close_dash_with_capslock_on(self):
+        """Dash must close on Alt+F4 even when the capslock is turned on."""
+        self.keyboard.press_and_release("Caps_Lock")
+        self.addCleanup(self.keyboard.press_and_release, "Caps_Lock")
+
+        self.dash.ensure_visible()
+        self.keyboard.press_and_release("Alt+F4")
+        self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
     def test_dash_closes_on_spread(self):
         """This test shows that when the spread is initiated, the dash closes."""
         self.dash.ensure_visible()
 
=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-07-06 00:12:18 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2012-07-10 03:30:31 +0000
@@ -254,6 +254,15 @@
         self.keyboard.press_and_release("Alt+F4")
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
+    def test_alt_f4_close_hud_with_capslock_on(self):
+        """Hud must close on Alt+F4 even when the capslock is turned on."""
+        self.keyboard.press_and_release("Caps_Lock")
+        self.addCleanup(self.keyboard.press_and_release, "Caps_Lock")
+
+        self.hud.ensure_visible()
+        self.keyboard.press_and_release("Alt+F4")
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
+
 
 class HudLauncherInteractionsTests(HudTestsBase):