Merge lp:~brandontschaefer/unity/hud-shrunk-click-close-SRU into lp:unity/5.0

[Brandon Schaefer]

Fixes closing the shurnk Hud when clicking outside it's geometry.

=== Problem ===
When the hud is shrunk you cannot click to close it where it would normaly be.

=== Fix ===
Use the current_height_ in detecting if the mouse click is in or out of the area.

=== Test ===
Ap tests

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-06-15 18:09:57 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-06-25 22:05:21 +0000
@@ -357,7 +357,7 @@
 {
   dash::Style& style = dash::Style::Instance();
 
-  nux::VLayout* super_layout = new nux::VLayout(); 
+  nux::VLayout* super_layout = new nux::VLayout();
   layout_ = new nux::HLayout();
   {
     // fill layout with icon
@@ -405,7 +405,7 @@
   {
     button->fake_focused = false;
   }
-  
+
   if (!buttons_.empty())
     buttons_.back()->fake_focused = true;
 }
@@ -424,7 +424,9 @@
 
 void View::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
 {
-  if (!content_geo_.IsPointInside(x, y))
+  nux::Geometry current_geo(content_geo_);
+  current_geo.height = current_height_;
+  if (!current_geo.IsPointInside(x, y))
   {
     ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
   }
@@ -464,7 +466,7 @@
       x += content_width - 1;
       nux::GetPainter().Draw2DLine(gfx_context, x, y, x, y + height, nux::color::White * 0.13);
     }
- 
+
     GetLayout()->ProcessDraw(gfx_context, force_draw);
     nux::GetPainter().PopBackgroundStack();
   }
@@ -504,7 +506,7 @@
 {
   unsigned num_buttons = buttons_.size();
   variant::BuilderWrapper(builder)
-    .add(GetGeometry())
+    .add(content_geo_)
     .add("selected_button", selected_button_)
     .add("num_buttons", num_buttons);
 }

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-06-19 16:59:06 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-06-25 22:05:21 +0000
@@ -207,7 +207,7 @@
         self.hud.ensure_visible()
         self.dash.ensure_visible()
         self.addCleanup(self.dash.ensure_hidden)
-    
+
         self.keybinding("launcher/keynav")
         self.assertThat(self.launcher.key_nav_is_active, Equals(False))
 
@@ -241,6 +241,32 @@
         self.assertThat(self.window_manager.scale_active, Eventually(Equals(True)))
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
+    def test_hud_closes_click_outside_geo_shrunk(self):
+        """
+        Clicking outside the hud when it is shurnk will make it close.
+        Shurnk is when the hud has no results and is much smaller then normal.
+        """
+
+        self.hud.ensure_visible()
+        (x,y,w,h) = self.hud.view.geometry
+        self.mouse.move(w/2, h-50)
+        self.mouse.click()
+
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
+
+    def test_hud_closes_click_outside_geo(self):
+        """Clicking outside of the hud will make it close."""
+
+        self.hud.ensure_visible()
+        self.keyboard.type("Test")
+
+        (x,y,w,h) = self.hud.view.geometry
+        self.mouse.move(w/2, h+50)
+        self.mouse.click()
+
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
+
+
 class HudLauncherInteractionsTests(HudTestsBase):
 
     launcher_modes = [('Launcher autohide', {'launcher_autohide': False}),