Merge lp:~sil2100/unity/fix-1061081-7.0 into lp:unity

[Łukasz Zemczak]

Cherry-picked andyrock's fix:
Revert rev 2780.
Use clip region to fix dash/launcher separator drawing bug.

Cherry-picked fix submitted to 6.0 (should be other way around!)

== Problem ==
[regression] Spinner doesn't spin around its center

== Fix ==
Revert buggy rev. Use clip region to fix dash/launcher separator drawing bug.

[Michal Hruby (mhr3)]

Released in 6.0 series, should have been in trunk already...

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-10-04 07:36:35 +0000
+++ dash/DashView.cpp	2012-10-05 11:49:41 +0000
@@ -370,14 +370,11 @@
 {
   dash::Style& style = dash::Style::Instance();
 
-  auto main_layout = new nux::HLayout;
-  main_layout->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
-  main_layout->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
-  SetLayout(main_layout);
-
   layout_ = new nux::VLayout();
+  layout_->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
+  layout_->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
+  SetLayout(layout_);
   layout_->SetRedirectRenderingToTexture(true);
-  main_layout->AddLayout(layout_);
 
   content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);
   content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding(), 0);
@@ -527,7 +524,13 @@
 
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
+  auto& style = dash::Style::Instance();
+
   renderer_.DrawInner(graphics_engine, content_geo_, GetAbsoluteGeometry(), GetGeometry());
+  
+  nux::Geometry clip_geo = layout_->GetGeometry();
+  clip_geo.x += style.GetVSeparatorSize();
+  graphics_engine.PushClippingRectangle(clip_geo);
 
   bool display_ghost = false;
   bool preview_redraw = false;
@@ -781,6 +784,8 @@
     nux::GetPainter().PopBackgroundStack();
   }
 
+  graphics_engine.PopClippingRectangle();
+
   renderer_.DrawInnerCleanup(graphics_engine, content_geo_, GetAbsoluteGeometry(), GetGeometry());
 }