Merge lp:~azzar1/unity/fix-955296 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: 2114
Proposed branch: lp:~azzar1/unity/fix-955296
Merge into: lp:unity
Diff against target: 20 lines (+6/-5)
1 file modified
plugins/unityshell/src/LensView.cpp (+6/-5)
To merge this branch: bzr merge lp:~azzar1/unity/fix-955296
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+97473@code.launchpad.net

Description of the change

Don't add the hseparator for the final dash category. It's a kind of regression due to the new message displayed when there are no results.

Test
====
Already in trunk.

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

Oh, I like reading this :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/LensView.cpp'
2--- plugins/unityshell/src/LensView.cpp 2012-03-13 02:21:23 +0000
3+++ plugins/unityshell/src/LensView.cpp 2012-03-14 17:53:25 +0000
4@@ -356,11 +356,12 @@
5 std::list<Area*> children = self->scroll_layout_->GetChildren();
6 std::list<AbstractPlacesGroup*> groups;
7
8- std::transform(children.begin(), children.end(), std::back_inserter(groups),
9- [](Area* obj) -> AbstractPlacesGroup*
10- {
11- return static_cast<AbstractPlacesGroup*>(obj);
12- });
13+ for (auto child : children)
14+ {
15+ if (child == self->no_results_)
16+ continue;
17+ groups.push_back(static_cast<AbstractPlacesGroup*>(child));
18+ }
19
20 dash::impl::UpdateDrawSeparators(groups);
21