Merge lp:~azzar1/unity/fix-1057798-6.0 into lp:unity/6.0

[Andrea Azzarone]

Fix rendering of the dash/launcher separator.

== Problem ==
[regression] Dash - Left separator is missing

== Test ==
Visual change - not applicable.

[Łukasz Zemczak (sil2100)]

Code - looking good. Tested it locally with 6.0 as well and works.

review: Approve

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-28 13:44:57 +0000
+++ dash/DashView.cpp	2012-10-01 17:42:20 +0000
@@ -338,11 +338,14 @@
 {
   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);