Unity

Merge lp:~nick-dedekind/unity/fix-music-preview-scroll into lp:unity

  1. fix-music-preview-scroll
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Neil J. Patel
Approved revision: no longer in the source branch.
Merged at revision: 2709
Proposed branch: lp:~nick-dedekind/unity/fix-music-preview-scroll
Merge into: lp:unity
Diff against target: 16 lines (+3/-3)
1 file modified
dash/previews/Track.cpp (+3/-3)
To merge this branch: bzr merge lp:~nick-dedekind/unity/fix-music-preview-scroll
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+124928@code.launchpad.net

Commit message

Fixed scrolling in music preview.

Description of the change

Fixed scrolling in music preview.

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/previews/Track.cpp'
2--- dash/previews/Track.cpp 2012-09-13 10:56:42 +0000
3+++ dash/previews/Track.cpp 2012-09-18 13:48:24 +0000
4@@ -349,9 +349,9 @@
5
6 nux::Area* Track::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
7 {
8- bool mouse_inside = TestMousePointerInclusionFilterMouseWheel(mouse_position, event_type);
9- if (mouse_inside == false)
10- return NULL;
11+ bool mouse_inside = TestMousePointerInclusion(mouse_position, event_type);
12+ if (mouse_inside == false)
13+ return NULL;
14
15 return this;
16 }