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

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2918
Proposed branch: lp:~azzar1/unity/fix-1080534
Merge into: lp:unity
Diff against target: 20 lines (+1/-2)
1 file modified
dash/FilterExpanderLabel.cpp (+1/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1080534
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+135278@code.launchpad.net

Commit message

Expand filter label view.

Description of the change

== Problem ==
Bug #1080534: Dash - Regression: Clicking between filter label and 'All' button no longer toggles filter label

== Fix ==
Remove un-needed nux::SpaceLayout.

== Test ==
There is already a failing AP test.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/FilterExpanderLabel.cpp'
2--- dash/FilterExpanderLabel.cpp 2012-10-15 12:50:14 +0000
3+++ dash/FilterExpanderLabel.cpp 2012-11-21 00:02:21 +0000
4@@ -137,7 +137,7 @@
5
6 expander_view_ = new ExpanderView(NUX_TRACKER_LOCATION);
7 expander_view_->SetLayout(expander_layout_);
8- top_bar_layout_->AddView(expander_view_, 0);
9+ top_bar_layout_->AddView(expander_view_, 1);
10
11 cairo_label_ = new nux::StaticCairoText(label_.c_str(), NUX_TRACKER_LOCATION);
12 cairo_label_->SetFont(FONT_EXPANDER_LABEL);
13@@ -161,7 +161,6 @@
14
15 expander_layout_->AddView(cairo_label_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
16 expander_layout_->AddView(arrow_layout_, 0, nux::MINOR_POSITION_CENTER);
17- top_bar_layout_->AddSpace(1, 1);
18
19 layout_->AddLayout(top_bar_layout_, 0, nux::MINOR_POSITION_START);
20 layout_->SetVerticalInternalMargin(0);