Merge lp:~brandontschaefer/unity/quicklist-close-super-open-dash into lp:unity

[Brandon Schaefer]

Quicklist closes when opening the Dash.

=== Problem ===
When a quicklist was open you could not open th dash.

=== Fix ===
If a quicklist is open and you press super it will now close the quicklist.

=== Test ===
AP Tests

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

34 + """When the quicklist is open and you open the dash:
35 + The quicklist should close then the dash must open.
36 +
37 + """

Please fix this docstring. "should" is a weasel word that implies ambiguity. I suggest a better docstring is something like:

"When a quicklist is open you must still be able to open the dash by pushing the Super key."""

39 + [calc_win1] = calc.get_windows()
40 + self.assertTrue(calc_win1.is_focused)

You don't need these two lines - you never use calc_win1, and we don't need to assert that the window is focused (that's not what we're testing).

45 + self.dash.ensure_visible()

If this succeeds you'll be leaving the dash open, which will cause the test to fail! Please add the following:

self.addCleanup(self.dash.ensure_hidden)

Other than that, looks good.

review: Needs Fixing (quality)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-07-11 03:15:53 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-07-11 20:52:29 +0000
@@ -1697,8 +1697,18 @@
     scale_just_activated_ = false;
   }
 
-  if (hud_controller_->IsVisible() && launcher_controller_->AboutToShowDash(was_tap, when))
-    hud_controller_->HideHud();
+  if (launcher_controller_->AboutToShowDash(was_tap, when))
+  {
+    if (hud_controller_->IsVisible())
+    {
+      hud_controller_->HideHud();
+    }
+
+    if (QuicklistManager::Default()->Current())
+    {
+      QuicklistManager::Default()->Current()->Hide();
+    }
+  }
 
   super_keypressed_ = false;
   launcher_controller_->KeyNavTerminate(true);

=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py	2012-07-11 04:28:16 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py	2012-07-11 20:52:29 +0000
@@ -137,13 +137,24 @@
         """When a quicklist is open you must still be able to open the Hud."""
         calc = self.start_app("Calculator")
 
-        calc_icon = self.launcher.model.get_icon_by_desktop_id(calc.desktop_file)
+        calc_icon = self.launcher.model.get_icon(desktop_id=calc.desktop_file)
         calc_ql = self.open_quicklist_for_icon(calc_icon)
 
         self.hud.ensure_visible()
         self.addCleanup(self.hud.ensure_hidden)
         self.assertThat(self.hud.visible, Eventually(Equals(True)))
 
+    def test_quicklist_closes_when_dash_opens(self):
+        """When the quicklist is open you must still be able to open the dash."""
+        calc = self.start_app("Calculator")
+
+        calc_icon = self.launcher.model.get_icon(desktop_id=calc.desktop_file)
+        calc_ql = self.open_quicklist_for_icon(calc_icon)
+
+        self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
+        self.assertThat(self.dash.visible, Eventually(Equals(True)))
+
 
 class QuicklistKeyNavigationTests(UnityTestCase):
     """Tests for the quicklist key navigation."""