Unity

Merge lp://staging/~azzar1/unity/fix-bug-955158 into lp://staging/unity

fix-bug-955158
Merge into trunk

Proposed by Andrea Azzarone on 2012-07-11

Status:

Merged

Approved by:

Andrea Azzarone on 2012-07-11

Approved revision:

no longer in the source branch.

Merged at revision:

2493

Proposed branch:

lp://staging/~azzar1/unity/fix-bug-955158

Merge into:

lp://staging/unity

Diff against target:

103 lines (+25/-18)

2 files modified

launcher/QuicklistView.cpp (+25/-16)
launcher/QuicklistView.h (+0/-2)

To merge this branch:

bzr merge lp://staging/~azzar1/unity/fix-bug-955158

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Azzarone (community)			Approve on 2012-07-11
Daniel van Vugt		2012-07-11	Pending
Tim Penhey		2012-07-11	Pending
jenkins	continuous-integration	2012-07-11	Pending
Review via email: mp+114334@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-06-26.

Commit message

Fix padding issues in quicklist view.

Description of the change

== Problem ==
padding between last quicklist item and bottom edge is non-deterministic (changes randomly)

== Test ==
Not applicable: visual change.

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-06-27: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:2445
http://s-jenkins:8080/job/unity-ci/25/

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-06-27: Posted in a previous version of this proposal

There are a lot of identical expressions:

38 + _top_space->SetMinimumHeight((_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius + _offset_correction);
39 + _top_space->SetMaximumHeight((_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius + _offset_correction);
40 +
41 + _bottom_space->SetMinimumHeight((_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius);
42 + _bottom_space->SetMaximumHeight((_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius);

Please only compute each different expression once. Like...

int b = (_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius;
int t = b + _offset_correction;
_top_space->SetMinimumHeight(t);
_top_space->SetMaximumHeight(t);
_bottom_space->SetMinimumHeight(b);
_bottom_space->SetMaximumHeight(b);

review: Needs Fixing

Revision history for this message

Andrea Azzarone (azzar1) wrote on 2012-06-27: Posted in a previous version of this proposal

> There are a lot of identical expressions:
>
> 38 + _top_space->SetMinimumHeight((_anchor_height - TotalItemHeight) /
> 2 + _padding + _corner_radius + _offset_correction);
> 39 + _top_space->SetMaximumHeight((_anchor_height - TotalItemHeight) /
> 2 + _padding + _corner_radius + _offset_correction);
> 40 +
> 41 + _bottom_space->SetMinimumHeight((_anchor_height -
> TotalItemHeight) / 2 + _padding + _corner_radius);
> 42 + _bottom_space->SetMaximumHeight((_anchor_height -
> TotalItemHeight) / 2 + _padding + _corner_radius);
>
> Please only compute each different expression once. Like...
>
> int b = (_anchor_height - TotalItemHeight) / 2 + _padding + _corner_radius;
> int t = b + _offset_correction;
> _top_space->SetMinimumHeight(t);
> _top_space->SetMaximumHeight(t);
> _bottom_space->SetMinimumHeight(b);
> _bottom_space->SetMaximumHeight(b);