Merge lp:~3v1n0/unity/close-overlays-on-spread-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

DashController / HudController: hide the overlay when the spread is initiated

Ported the changes in lp:~3v1n0/unity/close-overlays-on-spread/+merge/111005 to stable unity

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-04-20 10:01:53 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-06-19 17:02:28 +0000
@@ -65,6 +65,9 @@
       nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
     }
   });
+
+  auto spread_cb = sigc::bind(sigc::mem_fun(this, &Controller::HideDash), true);
+  PluginAdapter::Default()->initiate_spread.connect(spread_cb);
 }
 
 Controller::~Controller()

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-06-15 18:09:57 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-06-19 17:02:28 +0000
@@ -79,7 +79,9 @@
 
   launcher_width.changed.connect([&] (int new_width) { Relayout(); });
 
-  WindowManager::Default()->compiz_screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed));
+  auto wm = WindowManager::Default();
+  wm->compiz_screen_ungrabbed.connect(sigc::mem_fun(this, &Controller::OnScreenUngrabbed));
+  wm->initiate_spread.connect(sigc::bind(sigc::mem_fun(this, &Controller::HideHud), true));
 
   hud_service_.queries_updated.connect(sigc::mem_fun(this, &Controller::OnQueriesFinished));
   EnsureHud();
@@ -112,10 +114,11 @@
   window_->mouse_down_outside_pointer_grab_area.connect(sigc::mem_fun(this, &Controller::OnMouseDownOutsideWindow));
   
   /* FIXME - first time we load our windows there is a race that causes the input window not to actually get input, this side steps that by causing an input window show and hide before we really need it. */
-  WindowManager::Default()->saveInputFocus ();
+  auto wm = WindowManager::Default();
+  wm->saveInputFocus ();
   window_->EnableInputWindow(true, "Hud", true, false);
   window_->EnableInputWindow(false, "Hud", true, false);
-  WindowManager::Default()->restoreInputFocus ();
+  wm->restoreInputFocus ();
 }
 
 void Controller::SetupHudView()

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-04-19 21:14:54 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-06-19 17:02:28 +0000
@@ -60,6 +60,14 @@
         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()
+        self.addCleanup(self.keybinding, "spread/cancel")
+        self.keybinding("spread/start")
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+        self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
 
 class DashSearchInputTests(DashTestCase):
     """Test features involving input to the dash search"""
@@ -82,7 +90,6 @@
         self.call_gsettings_cmd('set', 'org.gnome.libgnomekbd.keyboard', 'options', "['Compose key\tcompose:caps']")
 
         super(DashMultiKeyTests, self).setUp()
-
     def test_multi_key(self):
         """Pressing 'Multi_key' must not add any characters to the search."""
         self.dash.reveal_application_lens()

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-04-24 13:14:52 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-06-19 17:02:28 +0000
@@ -233,6 +233,13 @@
         self.workspace.switch_to(2)
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
+    def test_hud_closes_on_spread(self):
+        """This test shows that when the spread is initiated, the hud closes."""
+        self.hud.ensure_visible()
+        self.addCleanup(self.keybinding, "spread/cancel")
+        self.keybinding("spread/start")
+        self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
 class HudLauncherInteractionsTests(HudTestsBase):