Merge lp:~brandontschaefer/unity/click-boarder-must-not-close-dash-6.0 into lp:unity/6.0

[Brandon Schaefer]

Clicking on the Dashs boarder no longer closes it.

=== Problem ===
With new changes to the Dashs geo you could click on the dash boarder which caused it to close.

=== Fix ===
Add the boarder the the geo when checking the input window of the Dash

=== Test ===
This fixes a failing AP test

[Tim Penhey (thumper)]

review: Approve

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-09-19 08:02:20 +0000
+++ dash/DashController.cpp	2012-09-20 03:42:30 +0000
@@ -24,6 +24,7 @@
 
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/DashStyle.h"
 #include "unity-shared/PluginAdapter.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UScreen.h"
@@ -457,9 +458,14 @@
 nux::Geometry Controller::GetInputWindowGeometry()
 {
   EnsureDash();
+  dash::Style& style = dash::Style::Instance();
   nux::Geometry const& window_geo(window_->GetGeometry());
   nux::Geometry const& view_content_geo(view_->GetContentGeometry());
-  return nux::Geometry(window_geo.x, window_geo.y, view_content_geo.width, view_content_geo.height);
+
+  nux::Geometry geo(window_geo.x, window_geo.y, view_content_geo.width, view_content_geo.height);
+  geo.width += style.GetDashRightTileWidth();
+  geo.height += style.GetDashBottomTileHeight();
+  return geo;
 }