Unity

Merge lp://staging/~bilalakhtar/unity/launcher-scroll-speed-906072 into lp://staging/unity

  1. launcher-scroll-speed-906072
  2. Merge into trunk
Proposed by Bilal Akhtar
Status: Merged
Approved by: Bilal Akhtar
Approved revision: no longer in the source branch.
Merged at revision: 2616
Proposed branch: lp://staging/~bilalakhtar/unity/launcher-scroll-speed-906072
Merge into: lp://staging/unity
Diff against target: 84 lines (+27/-4)
3 files modified
launcher/Launcher.cpp (+7/-2)
launcher/Launcher.h (+3/-1)
tests/test_launcher.cpp (+17/-1)
To merge this branch: bzr merge lp://staging/~bilalakhtar/unity/launcher-scroll-speed-906072
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+118407@code.staging.launchpad.net

Commit message

Increases launcher scroll speed using mouse wheel by 2.5 times the original.

Description of the change

Increases launcher scroll speed using mouse wheel by 2.5 times the original. In the original bug report, John said "at least twice", and 2.5x seems good for me. Since everyone's tastes differ, I'm sure others might prefer 3x or 2x or something. Feel free to add your comments.

Bug #906072

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

+1 for the change, could you add some unit-tests for it?

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

I sure will, thanks Marco for the suggestion!

Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM. BTW I'd prefer to use EmitMouseWheel.

review: Approve
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

I've added unit tests now, the branch is ready for a re-review.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Ok approving again. Note that unit-test should not depend on global state (**launcher_->SetHover(true);***) but Launcher code is not test-friendly.

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

No commit message specified.

Revision history for this message
Omer Akram (om26er) wrote :

added commit message and status approved again.

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

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

text conflict in tests/test_launcher.cpp

Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Branch ready to be merged again. I've resolved the conflicts.

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

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1110/console reported an error when processing this lp:~bilalakhtar/unity/launcher-scroll-speed-906072 branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.