Merge lp:~brandontschaefer/unity/lp.932718-fix into lp:unity

[Brandon Schaefer]

When the shortcut is open, and we receive a ButtonPress or KeyPress hide it. As this causes problems else where, and it really should close if the user attempts to do anything (even while holding super!)

When the shortcut is open, and we receive a ButtonPress or KeyPress hide it. As this causes problems else where, and it really should close if the user attempts to do anything (even while holding super!)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3495
http://jenkins.qa.ubuntu.com/job/unity-ci/341/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/228/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/229/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/341/rebuild

review: Needs Fixing (continuous-integration)

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

Fine... You probably could do the same by sending the signals to the nux view (as done for alt+tab), but this is fair enough.

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/260/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/2168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/216
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/216/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-08-27 21:43:12 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-09-10 23:17:17 +0000
@@ -1519,6 +1519,11 @@
       }
       break;
     case ButtonPress:
+      if (shortcut_controller_->Visible())
+      {
+        shortcut_controller_->Hide();
+      }
+
       if (super_keypressed_)
       {
         launcher_controller_->KeyNavTerminate(false);
@@ -1609,6 +1614,11 @@
       break;
     case KeyPress:
     {
+      if (shortcut_controller_->Visible())
+      {
+        shortcut_controller_->Hide();
+      }
+
       if (super_keypressed_)
       {
         /* We need an idle to postpone this action, after the current event

=== modified file 'tests/autopilot/unity/tests/test_shortcut_hint.py'
--- tests/autopilot/unity/tests/test_shortcut_hint.py	2013-05-20 09:26:00 +0000
+++ tests/autopilot/unity/tests/test_shortcut_hint.py	2013-09-10 23:17:17 +0000
@@ -125,11 +125,11 @@
         self.addCleanup(self.keyboard.press_and_release, "Escape")
         self.keybinding("launcher/switcher/next")
         self.keybinding("launcher/switcher/next")
-            
+
         sleep(switcher_timeout * 2)
 
         self.assertThat(self.unity.shortcut_hint.visible, Equals(False))
-        
+
         self.keybinding("launcher/switcher/prev")
 
     def test_launcher_switcher_prev_doesnt_show_shortcut_hint(self):
@@ -172,3 +172,14 @@
 
         self.assertThat(launcher.shortcuts_shown, Eventually(Equals(True)))
         self.assertThat(self.unity.shortcut_hint.visible, Eventually(Equals(True)))
+
+    def test_shortcut_hint_closes_after_key_event(self):
+        """ The shortcut hint must close when a key event comes through."""
+
+        self.unity.shortcut_hint.show()
+        self.assertThat(self.unity.shortcut_hint.visible, Eventually(Equals(True)))
+
+        self.addCleanup(self.unity.shortcut_hint.ensure_hidden)
+
+        self.keyboard.press_and_release("Ctrl")
+        self.assertThat(self.unity.shortcut_hint.visible, Eventually(Equals(False)))