Merge lp:~ahayzen/music-app/fix-1315775 into lp:music-app/trusty

[Andrew Hayzen]

* Block mouse wheel events on sheets to children

* Block mouse wheel events on sheets to children

[Victor Thompson (vthompson)]

Need information per comment #1 in the bug

https://bugs.launchpad.net/music-app/+bug/1315775/comments/1

review: Needs Information

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:446
http://91.189.93.70:8080/job/music-app-ci/761/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2397
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/761
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/763
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/482

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/761/rebuild

review: Approve (continuous-integration)

Unmerged revisions

446. By Andrew Hayzen on 2014-05-04

* Block mouse wheel events on sheets to children

=== modified file 'MusicaddtoPlaylist.qml'
--- MusicaddtoPlaylist.qml	2014-04-13 20:08:45 +0000
+++ MusicaddtoPlaylist.qml	2014-05-04 01:30:35 +0000
@@ -58,6 +58,13 @@
          }
      }
 
+     MouseArea {
+         anchors {
+             fill: parent
+         }
+         onWheel: wheel.accepted = true
+     }
+
      Rectangle {
          width: parent.width
          height: parent.height

=== modified file 'common/AlbumsSheet.qml'
--- common/AlbumsSheet.qml	2014-05-02 22:30:57 +0000
+++ common/AlbumsSheet.qml	2014-05-04 01:30:35 +0000
@@ -51,6 +51,13 @@
                 }
             }
 
+            MouseArea {
+                anchors {
+                    fill: parent
+                }
+                onWheel: wheel.accepted = true
+            }
+
             ListView {
                 clip: true
                 id: albumtrackslist

=== modified file 'common/SongsSheet.qml'
--- common/SongsSheet.qml	2014-04-13 20:08:45 +0000
+++ common/SongsSheet.qml	2014-05-04 01:30:35 +0000
@@ -54,6 +54,13 @@
                 }
             }
 
+            MouseArea {
+                anchors {
+                    fill: parent
+                }
+                onWheel: wheel.accepted = true
+            }
+
             ListView {
                 clip: true
                 id: albumtrackslist