Merge lp:~azzar1/unity/fix-839472 into lp:unity

[Andrea Azzarone]

Don't close the dash if the click is inside the desktop dash border.

== Problem ==
Dash - Clicking on the desktop dash border should do nothing, *NOT* close the dash.

== Test ==
AP test added.

[Tim Penhey (thumper)]

We shouldn't silently pass the tests if not in desktop form factor, but instead use:
  self.skip("Not in desktop form-factor.")

Also, instead of:
  sleep(1);
  self.assertTrue(self.dash.visible)

you can now use Thomi's

  self.assertThat(self.dash.visible, Eventually(Equals(True)))

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> We shouldn't silently pass the tests if not in desktop form factor, but
> instead use:
> self.skip("Not in desktop form-factor.")
>
> Also, instead of:
> sleep(1);
> self.assertTrue(self.dash.visible)
>
> you can now use Thomi's
>
> self.assertThat(self.dash.visible, Eventually(Equals(True)))

Done.

[Tim Penhey (thumper)]

Thanks.

review: Approve

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-04-05 14:44:57 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-04-18 08:26:19 +0000
@@ -2185,6 +2185,16 @@
   return pimpl->dash_shine_.texture();
 }
 
+int Style::GetDashBottomTileHeight() const
+{
+  return 30;
+}
+
+int Style::GetDashRightTileWidth() const
+{
+  return 30;
+}
+
 int Style::GetVSeparatorSize() const
 {
   return 1;

=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-04-05 23:07:43 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-04-18 08:26:19 +0000
@@ -180,6 +180,9 @@
   nux::BaseTexture* GetDashTopCornerMask();
   nux::BaseTexture* GetDashTopTile();
 
+  int GetDashBottomTileHeight() const;
+  int GetDashRightTileWidth() const;
+
   nux::BaseTexture* GetDashShine();
 
   nux::BaseTexture* GetSearchMagnifyIcon();

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-04-12 12:00:53 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-04-18 08:26:19 +0000
@@ -315,7 +315,16 @@
 
 void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
 {
-  if (!content_geo_.IsPointInside(x, y))
+  dash::Style& style = dash::Style::Instance();
+  nux::Geometry geo(content_geo_);
+
+  if (Settings::Instance().GetFormFactor() == FormFactor::DESKTOP)
+  {
+    geo.width += style.GetDashRightTileWidth();
+    geo.height += style.GetDashBottomTileHeight();
+  }
+
+  if (!geo.IsPointInside(x, y))
   {
     ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
   }
@@ -737,6 +746,7 @@
 
 void DashView::AddProperties(GVariantBuilder* builder)
 {
+  dash::Style& style = dash::Style::Instance();
   int num_rows = 1; // The search bar
 
   if (active_lens_view_)
@@ -750,8 +760,11 @@
     form_factor = "desktop";
 
   unity::variant::BuilderWrapper wrapper(builder);
+  wrapper.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height));
   wrapper.add("num_rows", num_rows);
   wrapper.add("form_factor", form_factor);
+  wrapper.add("right-border-width", style.GetDashRightTileWidth());
+  wrapper.add("bottom-border-height", style.GetDashBottomTileHeight());
 }
 
 nux::Area* DashView::KeyNavIteration(nux::KeyNavDirection direction)

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-04-17 21:49:58 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-04-18 08:26:19 +0000
@@ -447,4 +447,44 @@
         self.mouse.move(app_icon.x + (app_icon.width / 2),
                         app_icon.y + (app_icon.height / 2))
         self.mouse.click()
+
         self.assertThat(self.lensbar.active_lens, Eventually(Equals('applications.lens')))
+
+
+class DashBorderTests(DashTestCase):
+    """Tests that the dash border works well.
+    """
+    def setUp(self):
+        super(DashBorderTests, self).setUp()
+        self.dash.ensure_visible()
+
+    def test_click_right_border(self):
+        """Clicking on the right dash border should do nothing,
+        *NOT* close the dash.
+        """
+        if (self.dash.view.form_factor != "desktop"):
+            self.skip("Not in desktop form-factor.")
+
+        x = self.dash.view.x + self.dash.view.width + self.dash.view.right_border_width / 2;
+        y = self.dash.view.y + self.dash.view.height / 2;
+
+        self.mouse.move(x, y)
+        self.mouse.click()
+
+        self.assertThat(self.dash.visible, Eventually(Equals(True)))
+
+    def test_click_bottom_border(self):
+        """Clicking on the bottom dash border should do nothing,
+        *NOT* close the dash.
+        """
+        if (self.dash.view.form_factor != "desktop"):
+            self.skip("Not in desktop form-factor.")
+
+        x = self.dash.view.x + self.dash.view.width / 2;
+        y = self.dash.view.y + self.dash.view.height + self.dash.view.bottom_border_height / 2;
+
+        self.mouse.move(x, y)
+        self.mouse.click()
+
+        self.assertThat(self.dash.visible, Eventually(Equals(True)))
+