Skip to content

Commit dc28629

Browse files
committed
Merge pull request kivy#2328 from matham/mscroll
When mouse scrolling, don't pass it on to children. Fixes kivy#2031.
2 parents 0f6fa70 + 5908123 commit dc28629

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

kivy/uix/scrollview.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ def on_touch_down(self, touch):
598598
e.velocity = 0
599599
touch.ud[self._get_uid('svavoid')] = True
600600
e.trigger_velocity_update()
601-
return True
601+
return True
602602

603603
# no mouse scrolling, so the user is going to drag the scrollview with
604604
# this touch.
@@ -767,7 +767,6 @@ def convert_distance_to_scroll(self, dx, dy):
767767
sy = 1
768768
return sx, sy
769769

770-
771770
def update_from_scroll(self, *largs):
772771
'''Force the reposition of the content, according to current value of
773772
:attr:`scroll_x` and :attr:`scroll_y`.

0 commit comments

Comments
 (0)