Merge lp:~azzar1/unity/fix-1008603-5.0 into lp:unity/5.0

[Andrea Azzarone]

Draw the result grid in proximity of the search entry. Backport lp:~andyrock/unity/fix-1008603

== Problem ==
The result grid is not drawn in proximity of the search entry.

== Fix ==
Use nux::GetPainter().Draw2DLine to draw the grid behind the search entry.

== Test ==
Not applicable

== Screenshot ==
http://ubuntuone.com/5YADnxYrLKWYgQ32XUgrOZ

[Łukasz Zemczak (sil2100)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-04-17 07:28:31 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-06-06 13:26:19 +0000
@@ -1640,7 +1640,7 @@
   // draw the grid background
   {
     cairo_set_line_width(cr, 1);
-    cairo_move_to(cr, _align(x + width, odd), _align(y, odd));
+    cairo_move_to(cr, _align(x + width, odd), y);
     if (curve_bottom)
     {
       LOG_DEBUG(logger) << "curve: " << _align(x + width, odd) << " - " << _align(y + height - radius, odd);
@@ -1672,8 +1672,8 @@
     else
     {
       cairo_line_to(cr, _align(x + width, odd), _align(y + height, odd));
-      cairo_line_to(cr, _align(x, odd), _align(x + height, odd));
-      cairo_line_to(cr, _align(x, odd), _align(y, odd));
+      cairo_line_to(cr, _align(x, odd), _align(y + height, odd));
+      cairo_line_to(cr, _align(x, odd), y);
     }
 
     cairo_set_source_rgba(cr, pimpl->button_label_border_color_[nux::ButtonVisualState::VISUAL_STATE_NORMAL]);

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-04-24 11:37:05 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-06-06 13:26:19 +0000
@@ -44,10 +44,10 @@
 
 const int default_width = 960;
 const int default_height = 276;
-const int content_width = 941;
+const int content_width = 939;
 
 const int top_padding = 11;
-const int bottom_padding = 9;
+const int bottom_padding = 10;
 const int left_padding = 11;
 const int right_padding = 0;
 }
@@ -443,9 +443,21 @@
   renderer_.DrawInner(gfx_context, draw_content_geo, absolute_window_geometry_, window_geometry_);
 
   gfx_context.PushClippingRectangle(draw_content_geo);
+
   if (IsFullRedraw())
   {
     nux::GetPainter().PushBackgroundStack();
+
+    if (!buttons_.empty()) // See bug #1008603.
+    {
+      int height = 3;
+      int x = search_bar_->GetBaseX() + 1;
+      int y = search_bar_->GetBaseY() + search_bar_->GetBaseHeight() - height;
+      nux::GetPainter().Draw2DLine(gfx_context, x, y, x, y + height, nux::color::White * 0.13);
+      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();
   }