isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 00:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

test-layout: Port away from Behaviour

Browse Source 
Use a simple animation with a looping+reversing timeline.
This commit is contained in:
Emmanuele Bassi 2010-11-17 15:51:35 +00:00
parent eade1ab19e
commit b0f5350379
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/interactive/test-layout.c
View File

@ -4,7 +4,6 @@
#include <gmodule.h> #include <gmodule.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#undef CLUTTER_DISABLE_DEPRECATED
#include <clutter/clutter.h> #include <clutter/clutter.h>
/* layout actor, by Lucas Rocha */ /* layout actor, by Lucas Rocha */
@ -566,7 +565,6 @@ my_thing_new (gfloat padding,
static ClutterActor *box = NULL; static ClutterActor *box = NULL;
static ClutterActor *icon = NULL; static ClutterActor *icon = NULL;
static ClutterTimeline *main_timeline = NULL; static ClutterTimeline *main_timeline = NULL;
static ClutterBehaviour *behaviour = NULL;
static void static void
toggle_property_value (ClutterActor *actor, toggle_property_value (ClutterActor *actor,
@ -627,8 +625,12 @@ create_item (void)
gint32 size = g_random_int_range (MIN_SIZE, MAX_SIZE); gint32 size = g_random_int_range (MIN_SIZE, MAX_SIZE);
clutter_actor_set_size (clone, size, size); clutter_actor_set_size (clone, size, size);
clutter_actor_animate_with_timeline (clone, CLUTTER_EASE_OUT_CUBIC,
clutter_behaviour_apply (behaviour, clone); main_timeline,
"scale-x", 2.0,
"scale-y", 2.0,
"fixed::scale-gravity", CLUTTER_GRAVITY_CENTER,
NULL);
return clone; return clone;
} }
@ -743,7 +745,6 @@ G_MODULE_EXPORT int
test_layout_main (int argc, char *argv[]) test_layout_main (int argc, char *argv[])
{ {
ClutterActor *stage, *instructions; ClutterActor *stage, *instructions;
ClutterAlpha *alpha;
gint i, size; gint i, size;
GError *error = NULL; GError *error = NULL;
@ -754,12 +755,11 @@ test_layout_main (int argc, char *argv[])
main_timeline = clutter_timeline_new (2000); main_timeline = clutter_timeline_new (2000);
clutter_timeline_set_loop (main_timeline, TRUE); clutter_timeline_set_loop (main_timeline, TRUE);
clutter_timeline_set_reverse (main_timeline, TRUE);
g_signal_connect (main_timeline, "new-frame", g_signal_connect (main_timeline, "new-frame",
G_CALLBACK (relayout_on_frame), G_CALLBACK (relayout_on_frame),
NULL); NULL);
alpha = clutter_alpha_new_full (main_timeline, CLUTTER_LINEAR);
behaviour = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 2.0, 2.0);
box = my_thing_new (10, 10); box = my_thing_new (10, 10);
@ -775,8 +775,13 @@ test_layout_main (int argc, char *argv[])
size = g_random_int_range (MIN_SIZE, MAX_SIZE); size = g_random_int_range (MIN_SIZE, MAX_SIZE);
clutter_actor_set_size (icon, size, size); clutter_actor_set_size (icon, size, size);
clutter_behaviour_apply (behaviour, icon);
clutter_container_add_actor (CLUTTER_CONTAINER (box), icon); clutter_container_add_actor (CLUTTER_CONTAINER (box), icon);
clutter_actor_animate_with_timeline (icon, CLUTTER_EASE_OUT_CUBIC,
main_timeline,
"scale-x", 2.0,
"scale-y", 2.0,
"fixed::scale-gravity", CLUTTER_GRAVITY_CENTER,
NULL);
for (i = 1; i < 33; i++) for (i = 1; i < 33; i++)
{ {
@ -807,12 +812,13 @@ test_layout_main (int argc, char *argv[])
G_CALLBACK (keypress_cb), G_CALLBACK (keypress_cb),
NULL); NULL);
clutter_timeline_stop (main_timeline);
clutter_actor_show (stage); clutter_actor_show (stage);
clutter_main (); clutter_main ();
g_object_unref (main_timeline); g_object_unref (main_timeline);
g_object_unref (behaviour);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }