diff --git a/kivy/clock.py b/kivy/clock.py index f0411b8a9..a52b3c9e8 100644 --- a/kivy/clock.py +++ b/kivy/clock.py @@ -449,7 +449,7 @@ See :mod:`~kivy.app` for example usage. __all__ = ( 'Clock', 'ClockNotRunningError', 'ClockEvent', 'FreeClockEvent', - 'CyClockBase', 'CyClockBaseFree', + 'CyClockBase', 'CyClockBaseFree', 'triggered', 'ClockBaseBehavior', 'ClockBaseInterruptBehavior', 'ClockBaseInterruptFreeBehavior', 'ClockBase', 'ClockBaseInterrupt', 'ClockBaseFreeInterruptAll', 'ClockBaseFreeInterruptOnly', 'mainthread') diff --git a/kivy/effects/dampedscroll.py b/kivy/effects/dampedscroll.py index c55dca7f9..0c5744d6b 100644 --- a/kivy/effects/dampedscroll.py +++ b/kivy/effects/dampedscroll.py @@ -55,6 +55,7 @@ class DampedScrollEffect(ScrollEffect): :attr:`round_value` is a :class:`~kivy.properties.BooleanProperty` and defaults to True. ''' + def update_velocity(self, dt): if abs(self.velocity) <= self.min_velocity and self.overscroll == 0: self.velocity = 0 diff --git a/kivy/effects/kinetic.py b/kivy/effects/kinetic.py index 1210f6f87..a03e4d2a4 100644 --- a/kivy/effects/kinetic.py +++ b/kivy/effects/kinetic.py @@ -59,21 +59,21 @@ class KineticEffect(EventDispatcher): friction = NumericProperty(0.05) '''Friction to apply on the velocity - :attr:`velocity` is a :class:`~kivy.properties.NumericProperty` and + :attr:`friction` is a :class:`~kivy.properties.NumericProperty` and defaults to 0.05. ''' value = NumericProperty(0) '''Value (during the movement and computed) of the effect. - :attr:`velocity` is a :class:`~kivy.properties.NumericProperty` and + :attr:`value` is a :class:`~kivy.properties.NumericProperty` and defaults to 0. ''' is_manual = BooleanProperty(False) '''Indicate if a movement is in progress (True) or not (False). - :attr:`velocity` is a :class:`~kivy.properties.BooleanProperty` and + :attr:`is_manual` is a :class:`~kivy.properties.BooleanProperty` and defaults to False. ''' @@ -84,6 +84,7 @@ class KineticEffect(EventDispatcher): :attr:`max_history` is a :class:`~kivy.properties.NumericProperty` and defaults to 5. ''' + min_distance = NumericProperty(.1) '''The minimal distance for a movement to have nonzero velocity. diff --git a/kivy/effects/scroll.py b/kivy/effects/scroll.py index 9c9dc4c91..a2d5423a5 100644 --- a/kivy/effects/scroll.py +++ b/kivy/effects/scroll.py @@ -31,7 +31,7 @@ class ScrollEffect(KineticEffect): drag_threshold = NumericProperty('20sp') '''Minimum distance to travel before the movement is considered as a drag. - :attr:`velocity` is a :class:`~kivy.properties.NumericProperty` and + :attr:`drag_threshold` is a :class:`~kivy.properties.NumericProperty` and defaults to 20sp. '''