diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 2766b6501..becb73afd 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -172,7 +172,7 @@ * * The initial @ is mandatory. * The section fragment can be one between - * "actions" or "constraints". + * "actions", "constraints" and "effects". * The meta-name fragment is the name of the * action or constraint, as specified by the #ClutterActorMeta:name * property. @@ -8401,6 +8401,7 @@ get_meta_from_animation_property (ClutterActor *actor, * * - actions * - constraints + * - effects * * and is the name set on a specific ActorMeta */ @@ -8420,6 +8421,9 @@ get_meta_from_animation_property (ClutterActor *actor, if (strcmp (tokens[0], "constraints") == 0) meta = _clutter_meta_group_get_meta (priv->constraints, tokens[1]); + if (strcmp (tokens[0], "effects") == 0) + meta = _clutter_meta_group_get_meta (priv->effects, tokens[1]); + if (name_p != NULL) *name_p = g_strdup (tokens[2]); diff --git a/tests/interactive/test-rotate.c b/tests/interactive/test-rotate.c index 60f85df96..f8018692d 100644 --- a/tests/interactive/test-rotate.c +++ b/tests/interactive/test-rotate.c @@ -20,6 +20,10 @@ test_rotate_main (int argc, char *argv[]) clutter_init (&argc, &argv); + /* Make a timeline */ + timeline = clutter_timeline_new (7692); + clutter_timeline_set_loop (timeline, TRUE); + stage = clutter_stage_get_default (); clutter_stage_set_color (CLUTTER_STAGE (stage), @@ -35,7 +39,10 @@ test_rotate_main (int argc, char *argv[]) clutter_actor_set_position (hand, 240, 140); clutter_actor_show (hand); - clutter_actor_add_effect (hand, clutter_desaturate_effect_new (0.75)); + clutter_actor_add_effect_with_name (hand, "desaturate", clutter_desaturate_effect_new (0.75)); + clutter_actor_animate_with_timeline (hand, CLUTTER_LINEAR, timeline, + "@effects.desaturate.factor", 1.0, + NULL); label = clutter_text_new_with_text ("Mono 16", "The Wonder\n" @@ -47,10 +54,6 @@ test_rotate_main (int argc, char *argv[]) clutter_container_add (CLUTTER_CONTAINER (stage), hand, label, NULL); - /* Make a timeline */ - timeline = clutter_timeline_new (7692); /* num frames, fps */ - clutter_timeline_set_loop (timeline, TRUE); - /* Set an alpha func to power behaviour */ alpha = clutter_alpha_new_full (timeline, CLUTTER_LINEAR);