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

Merge pull request #2708 from kivy/focus_parachute 

uix:FocusBehavior make sure changing focus for previous and next don't c...
This commit is contained in:
Akshay Arora 2014-12-02 01:01:18 +05:30
parent a856121dc2 38c2482b94
commit 91a82a5d4c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kivy/uix/behaviors.py
View File

@ -93,7 +93,7 @@ class ButtonBehavior(object):
def _do_release(self, *args): def _do_release(self, *args):
self.state = 'normal' self.state = 'normal'
def cancel_event(self, *args): def cancel_event(self, *args):
if self.__state_event: if self.__state_event:
self.__state_event.cancel() self.__state_event.cancel()
@ -131,7 +131,8 @@ class ButtonBehavior(object):
self.last_touch = touch self.last_touch = touch
touchtime = time() - self.__touch_time touchtime = time() - self.__touch_time
if touchtime < self.MIN_STATE_TIME: if touchtime < self.MIN_STATE_TIME:
self.__state_event = Clock.schedule_once(self._do_release, self.MIN_STATE_TIME - touchtime) self.__state_event = Clock.schedule_once(
self._do_release, self.MIN_STATE_TIME - touchtime)
else: else:
self._do_release() self._do_release()
self.dispatch('on_release') self.dispatch('on_release')
@ -224,7 +225,7 @@ class ToggleButtonBehavior(ButtonBehavior):
widget.state = 'normal' widget.state = 'normal'
def _do_press(self): def _do_press(self):
if (not self.allow_no_selection and if (not self.allow_no_selection and
self.group and self.state == 'down'): self.group and self.state == 'down'):
return return
self._release_group(self) self._release_group(self)
@ -795,7 +796,11 @@ class FocusBehavior(object):
next = self._get_focus_next('focus_next') next = self._get_focus_next('focus_next')
if next: if next:
self.focused = False self.focused = False
next.focused = True
def _fn(dt):
next.focused = True
Clock.schedule_once(_fn)
return True return True
return False return False