Merge pull request #2328 from matham/mscroll

When mouse scrolling, don't pass it on to children. Fixes #2031.

kivy/uix/scrollview.py

@@ -598,7 +598,7 @@ class ScrollView(StencilView):
                     e.velocity = 0
                 touch.ud[self._get_uid('svavoid')] = True
                 e.trigger_velocity_update()
-                return True
+            return True
 
         # no mouse scrolling, so the user is going to drag the scrollview with
         # this touch.
@@ -767,7 +767,6 @@ class ScrollView(StencilView):
             sy = 1
         return sx, sy
 
-
     def update_from_scroll(self, *largs):
         '''Force the reposition of the content, according to current value of
         :attr:`scroll_x` and :attr:`scroll_y`.