Unity

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

  1. fix-1057798
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2780
Proposed branch: lp:~azzar1/unity/fix-1057798
Merge into: lp:unity
Diff against target: 21 lines (+6/-3)
1 file modified
dash/DashView.cpp (+6/-3)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1057798
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+127334@code.launchpad.net

Commit message

Fix rendering of the dash/launcher separator.

Description of the change

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

== Test ==
Visual change - not applicable.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Code - looking good. Tested it locally and works.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1440/console reported an error when processing this lp:~andyrock/unity/fix-1057798 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp 2012-09-28 01:10:48 +0000
+++ dash/DashView.cpp 2012-10-01 17:33:21 +0000
@@ -338,11 +338,14 @@
338{338{
339 dash::Style& style = dash::Style::Instance();339 dash::Style& style = dash::Style::Instance();
340340
341 auto main_layout = new nux::HLayout;
342 main_layout->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
343 main_layout->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
344 SetLayout(main_layout);
345
341 layout_ = new nux::VLayout();346 layout_ = new nux::VLayout();
342 layout_->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
343 layout_->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
344 SetLayout(layout_);
345 layout_->SetRedirectRenderingToTexture(true);347 layout_->SetRedirectRenderingToTexture(true);
348 main_layout->AddLayout(layout_);
346349
347 content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);350 content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);
348 content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding(), 0);351 content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding(), 0);