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

scrollview: fix pos/size scroll and use a trigger instead. Splitter works on kivycatalog again.

This commit is contained in:
Mathieu Virbel 2013-05-12 14:06:42 +02:00
parent 7b4f8b2df7
commit 2fd44bbb7e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kivy/uix/scrollview.py
View File

@ -326,9 +326,8 @@ class ScrollView(StencilView):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self._touch = None self._touch = None
self._tdx = self._tdy = self._ts = self._tsn = 0 self._trigger_update_from_scroll = Clock.create_trigger(
self._scroll_y_mouse = 1 self.update_from_scroll, -1)
self._scroll_x_mouse = 1
super(ScrollView, self).__init__(**kwargs) super(ScrollView, self).__init__(**kwargs)
if self.effect_x is None and self.effect_cls is not None: if self.effect_x is None and self.effect_cls is not None:
self.effect_x = self.effect_cls(target_widget=self._viewport) self.effect_x = self.effect_cls(target_widget=self._viewport)
@ -340,6 +339,11 @@ class ScrollView(StencilView):
viewport_size=self._update_effect_bounds) viewport_size=self._update_effect_bounds)
self.bind(_viewport=self._update_effect_widget) self.bind(_viewport=self._update_effect_widget)
self.bind(scroll_x=self._trigger_update_from_scroll,
scroll_y=self._trigger_update_from_scroll,
pos=self._trigger_update_from_scroll,
size=self._trigger_update_from_scroll)
self._update_effect_widget() self._update_effect_widget()
self._update_effect_x_bounds() self._update_effect_x_bounds()
self._update_effect_y_bounds() self._update_effect_y_bounds()
@ -397,7 +401,7 @@ class ScrollView(StencilView):
return return
sx = self.effect_x.scroll / float(sw) sx = self.effect_x.scroll / float(sw)
self.scroll_x = -sx self.scroll_x = -sx
self.update_from_scroll() self._trigger_update_from_scroll()
def _update_effect_y(self, *args): def _update_effect_y(self, *args):
vp = self._viewport vp = self._viewport
@ -408,7 +412,7 @@ class ScrollView(StencilView):
return return
sy = self.effect_y.scroll / float(sh) sy = self.effect_y.scroll / float(sh)
self.scroll_y = -sy self.scroll_y = -sy
self.update_from_scroll() self._trigger_update_from_scroll()
def on_touch_down(self, touch): def on_touch_down(self, touch):
if not self.collide_point(*touch.pos): if not self.collide_point(*touch.pos):
@ -608,8 +612,8 @@ class ScrollView(StencilView):
raise Exception('ScrollView accept only one widget') raise Exception('ScrollView accept only one widget')
super(ScrollView, self).add_widget(widget, index) super(ScrollView, self).add_widget(widget, index)
self._viewport = widget self._viewport = widget
widget.bind(size=self.update_from_scroll) widget.bind(size=self._trigger_update_from_scroll)
self.update_from_scroll() self._trigger_update_from_scroll()
def remove_widget(self, widget): def remove_widget(self, widget):
super(ScrollView, self).remove_widget(widget) super(ScrollView, self).remove_widget(widget)