Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:kivy/kivy

This commit is contained in:
tshirtman 2012-12-08 23:57:52 +01:00
parent 795e301fd8 a110b867f4
commit f49f9e650e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kivy/uix/scrollview.py
View File

@ -362,17 +362,19 @@ class ScrollView(StencilView):
if vp.width > self.width: if vp.width > self.width:
# let's say we want to move over 40 pixels each scroll # let's say we want to move over 40 pixels each scroll
d = (vp.width - self.width) d = (vp.width - self.width)
sxd = None
if d != 0: if d != 0:
d = self.scroll_distance / float(d) d = self.scroll_distance / float(d)
if touch.button == 'scrollright': if touch.button == 'scrollright':
sxd = self._scroll_x_mouse - d sxd = self._scroll_x_mouse - d
elif touch.button == 'scrollleft': elif touch.button == 'scrollleft':
sxd = self._scroll_x_mouse + d sxd = self._scroll_x_mouse + d
self._scroll_x_mouse = scroll_x = min(max(sxd, 0), 1) if sxd is not None:
Animation.stop_all(self, 'scroll_x') self._scroll_x_mouse = scroll_x = min(max(sxd, 0), 1)
Animation(scroll_x=scroll_x, d=.3, t='out_quart').start(self) Animation.stop_all(self, 'scroll_x')
Clock.unschedule(self._update_animation) Animation(scroll_x=scroll_x, d=.3, t='out_quart').start(self)
return True Clock.unschedule(self._update_animation)
return True
self._touch = touch self._touch = touch
uid = self._get_uid() uid = self._get_uid()