brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

actor: Ensure we use the current easing duration and mode

Browse Source 
When updating a transition in flight, if the current easing state does
not match the transition's.
This commit is contained in:
Emmanuele Bassi 2012-03-28 16:39:30 +01:00
parent 824dfcc67e
commit cede56dcdd
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/clutter-actor.c
View File

@ -17068,14 +17068,27 @@ _clutter_actor_update_transition (ClutterActor *actor,
/* if we're updating with an easing duration of zero milliseconds, /* if we're updating with an easing duration of zero milliseconds,
* we just jump the timeline to the end and let it run its course * we just jump the timeline to the end and let it run its course
*/ */
if (info->cur_state == NULL || info->cur_state->easing_duration == 0) if (info->cur_state != NULL &&
info->cur_state->easing_duration != 0)
{
guint cur_duration = clutter_timeline_get_duration (timeline);
ClutterAnimationMode cur_mode =
clutter_timeline_get_progress_mode (timeline);
if (cur_duration != info->cur_state->easing_duration)
clutter_timeline_set_duration (timeline, info->cur_state->easing_duration);
if (cur_mode != info->cur_state->easing_mode)
clutter_timeline_set_progress_mode (timeline, info->cur_state->easing_mode);
clutter_timeline_rewind (timeline);
}
else
{ {
guint duration = clutter_timeline_get_duration (timeline); guint duration = clutter_timeline_get_duration (timeline);
clutter_timeline_advance (timeline, duration); clutter_timeline_advance (timeline, duration);
} }
else
clutter_timeline_rewind (timeline);
out: out:
g_value_unset (&initial); g_value_unset (&initial);