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

Merge pull request #574 from revolunet/transitionrename 

screenmanager renames
This commit is contained in:
Mathieu Virbel 2012-07-18 04:26:01 -07:00
parent 1cc2fefa77 286d0172fc
commit 6cdd17deb1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kivy/uix/screenmanager.py
View File

@ -151,7 +151,7 @@ class Screen(RelativeLayout):
None, read-only.
'''
transition_alpha = NumericProperty(0.)
transition_progress = NumericProperty(0.)
'''Value that represent the completion of the current transition, if any is
occuring.
@ -159,7 +159,7 @@ class Screen(RelativeLayout):
to 1. If you want to know if it's an entering or leaving animation, check
the :data:`transition_state`
:data:`transition_alpha` is a :class:`~kivy.properties.NumericProperty`,
:data:`transition_progress` is a :class:`~kivy.properties.NumericProperty`,
default to 0.
'''
@ -241,9 +241,9 @@ class TransitionBase(EventDispatcher):
on_complete=self._on_complete)
self.add_screen(self.screen_in)
self.screen_in.transition_value = 0.
self.screen_in.transition_progress = 0.
self.screen_in.transition_mode = 'in'
self.screen_out.transition_value = 0.
self.screen_out.transition_progress = 0.
self.screen_out.transition_mode = 'out'
self._anim.start(self)
@ -275,10 +275,10 @@ class TransitionBase(EventDispatcher):
pass
def _on_progress(self, *l):
alpha = l[-1]
self.screen_in.transition_value = alpha
self.screen_out.transition_value = 1. - alpha
self.dispatch('on_progress', alpha)
progress = l[-1]
self.screen_in.transition_progress = progress
self.screen_out.transition_progress = 1. - progress
self.dispatch('on_progress', progress)
def _on_complete(self, *l):
self.dispatch('on_complete')