Unity

Merge lp://qastaging/~bilalakhtar/unity/dash-expand-result-950710 into lp://qastaging/unity

dash-expand-result-950710
Merge into trunk

Proposed by Bilal Akhtar on 2012-08-03

Status:

Merged

Approved by:

Bilal Akhtar on 2012-08-28

Approved revision:

no longer in the source branch.

Merged at revision:

2635

Proposed branch:

lp://qastaging/~bilalakhtar/unity/dash-expand-result-950710

Merge into:

lp://qastaging/unity

Diff against target:

108 lines (+55/-0)

3 files modified

dash/LensView.cpp (+32/-0)
dash/LensView.h (+2/-0)
manual-tests/Dash.txt (+21/-0)

To merge this branch:

bzr merge lp://qastaging/~bilalakhtar/unity/dash-expand-result-950710

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Michal Hruby (community)	2012-08-24	Needs Fixing on 2012-09-05
Tim Penhey (community)	2012-08-03	Approve on 2012-08-27
Review via email: mp+118029@code.qastaging.launchpad.net

Commit message

Fixes bug #950710 by expanding a PlacesGroup if it is the only category that contains results.

Description of the change

Fixes bug #950710 by expanding a PlacesGroup if it is the only category that contains results.

Revision history for this message

Tim Penhey (thumper) wrote on 2012-08-08:

if you are going to have "no_of_displayed_categories" why not "number_of_displayed_categories"?

"no_of_" isn't particularly intuitive.

Also, the static variable in the method seems like a hack. If you need a member, use a member.

Also, tests needed.

review: Needs Fixing

Revision history for this message

Bilal Akhtar (bilalakhtar) wrote on 2012-08-08:

I've added a manual test, since a unit test would be very time consuming to write up (I gave it a shot already, see past few comments), and an autopilot test would be near impossible (the way to test this bug fix differs for each system). I hope the manual test is sufficient. It might not be worded well; feel free to give your feedback on this.

Revision history for this message

Tim Penhey (thumper) wrote on 2012-08-27:

Looks reasonable.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-08-27:

No commit message specified.

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-08-28:

Attempt to merge into lp:unity failed due to conflicts:

text conflict in dash/LensView.cpp

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-09-05:

19 + CheckCategoryExpansion();

Calling this in each OnRowAdded is terribly ineffective, and causing a lag in dash that can last a couple of seconds when there are lots of results, please use an idle source with high priority to fix.

review: Needs Fixing