isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-06 13:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Remove automatic transition init from add_transition()

Browse Source 
Adding an explicit transition overrides any consideration of the easing
state of an actor.
This commit is contained in:
Emmanuele Bassi 2012-04-19 16:35:39 +01:00
parent 0b76ba332d
commit 217c4e7ba0
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-actor.c
View File

@ -17244,10 +17244,6 @@ out:
* The @name string is a per-actor unique identifier of the @transition: only * The @name string is a per-actor unique identifier of the @transition: only
* one #ClutterTransition can be associated to the specified @name. * one #ClutterTransition can be associated to the specified @name.
* *
* The @transition will be given the easing duration, mode, and delay
* associated to the actor's current easing state; it is possible to modify
* these values after calling clutter_actor_add_transition().
*
* The @transition will be started once added. * The @transition will be started once added.
* *
* This function will take a reference on the @transition. * This function will take a reference on the @transition.
@ -17290,13 +17286,6 @@ clutter_actor_add_transition (ClutterActor *self,
timeline = CLUTTER_TIMELINE (transition); timeline = CLUTTER_TIMELINE (transition);
if (info->cur_state != NULL)
{
clutter_timeline_set_delay (timeline, info->cur_state->easing_delay);
clutter_timeline_set_duration (timeline, info->cur_state->easing_duration);
clutter_timeline_set_progress_mode (timeline, info->cur_state->easing_mode);
}
clos = g_slice_new (TransitionClosure); clos = g_slice_new (TransitionClosure);
clos->actor = self; clos->actor = self;
clos->transition = g_object_ref (transition); clos->transition = g_object_ref (transition);

7
tests/interactive/test-keyframe-transition.c
View File

@ -50,11 +50,8 @@ test_keyframe_transition_main (int argc, char *argv[])
clutter_actor_set_position (rect, PADDING, cur_y); clutter_actor_set_position (rect, PADDING, cur_y);
clutter_actor_add_child (stage, rect); clutter_actor_add_child (stage, rect);
clutter_actor_save_easing_state (rect);
clutter_actor_set_easing_duration (rect, 2000);
clutter_actor_set_easing_mode (rect, CLUTTER_LINEAR);
group = clutter_transition_group_new (); group = clutter_transition_group_new ();
clutter_timeline_set_duration (CLUTTER_TIMELINE (group), 2000);
clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (group), 1); clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (group), 1);
clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (group), TRUE); clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (group), TRUE);
@ -80,8 +77,6 @@ test_keyframe_transition_main (int argc, char *argv[])
clutter_actor_add_transition (rect, "rectAnimation", group); clutter_actor_add_transition (rect, "rectAnimation", group);
g_object_unref (group); g_object_unref (group);
clutter_actor_restore_easing_state (rect);
} }
clutter_actor_show (stage); clutter_actor_show (stage);