Unity

Merge lp:~3v1n0/unity/scroll-wheel-fixes into lp:unity

  1. scroll-wheel-fixes
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~3v1n0/unity/scroll-wheel-fixes
Merge into: lp:unity
Diff against target: 0 lines
To merge this branch: bzr merge lp:~3v1n0/unity/scroll-wheel-fixes
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+227072@code.launchpad.net

Commit message

SwitcherView, PanelService: correctly handle horizontal and vertical scroll events

Description of the change

This has a "soft" dependency on lp:~3v1n0/nux/horizontal-scroll-delta/+merge/227070, this means that this code would just work as it used to do (except for the SwitcerView fix) if that nux branch is not used, while it will support correctly horizontal scroll events when both the branches are used.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3847
http://jenkins.qa.ubuntu.com/job/unity-ci/1027/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/114/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1027/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Two failing tests:

[ FAILED ] 2 tests, listed below:
[ FAILED ] TestLauncher.TestMouseWheelScroll
[ FAILED ] TestLauncher.TestMouseWheelScrollAltPressed

review: Needs Fixing
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok, sorry for the failure, it's fixed now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3848
http://jenkins.qa.ubuntu.com/job/unity-ci/1029/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/116

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1029/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

This fixes the Alt-Tab scenario.

I tried the indicator-sound scenario and it still acts the same, but I saw that there is a MP to fix libindicator, so I think this is good.

review: Approve

Preview Diff

Empty