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

2008-01-27 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* tests/test-depth.c (main): Use a group instead of pushing
	the actors on the stage.
This commit is contained in:
Emmanuele Bassi 2008-01-27 23:39:23 +00:00
parent d11e3b03e2
commit 5bf265fbae
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,9 +1,14 @@
2008-01-25 Emmanuele Bassi <ebassi@sprite> 2008-01-27 Emmanuele Bassi <ebassi@openedhand.com>
* tests/test-depth.c (main): Use a group instead of pushing
the actors on the stage.
2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-group.c (sort_z_order): Invert condition to * clutter/clutter-group.c (sort_z_order): Invert condition to
return to the same as in revision 1976. return to the same as in revision 1976.
2008-01-25 Emmanuele Bassi <ebassi@sprite> 2008-01-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-label.c (clutter_label_query_coords): Check * clutter/clutter-label.c (clutter_label_query_coords): Check
if the layout logical rectangle size is bigger than the bounding if the layout logical rectangle size is bigger than the bounding

12
tests/test-depth.c
View File

@ -35,7 +35,7 @@ main (int argc, char *argv[])
{ {
ClutterTimeline *timeline; ClutterTimeline *timeline;
ClutterActor *stage; ClutterActor *stage;
ClutterActor *hand, *label, *rect; ClutterActor *group, *hand, *label, *rect;
ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff }; ClutterColor stage_color = { 0xcc, 0xcc, 0xcc, 0xff };
ClutterColor rect_color = { 0, 0, 0, 0x88 }; ClutterColor rect_color = { 0, 0, 0, 0x88 };
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
@ -56,6 +56,10 @@ main (int argc, char *argv[])
"button-press-event", G_CALLBACK (clutter_main_quit), "button-press-event", G_CALLBACK (clutter_main_quit),
NULL); NULL);
group = clutter_group_new ();
clutter_stage_add (stage, group);
clutter_actor_show (group);
label = clutter_label_new_with_text ("Mono 26", "Clutter"); label = clutter_label_new_with_text ("Mono 26", "Clutter");
clutter_actor_set_position (label, 40, 140); clutter_actor_set_position (label, 40, 140);
clutter_actor_show (label); clutter_actor_show (label);
@ -69,7 +73,7 @@ main (int argc, char *argv[])
clutter_actor_set_size (rect, 200, 200); clutter_actor_set_size (rect, 200, 200);
clutter_actor_show (rect); clutter_actor_show (rect);
clutter_container_add (CLUTTER_CONTAINER (stage), hand, label, rect, NULL); clutter_container_add (CLUTTER_CONTAINER (group), hand, label, rect, NULL);
/* 3 seconds, at 60 fps */ /* 3 seconds, at 60 fps */
timeline = clutter_timeline_new (180, 60); timeline = clutter_timeline_new (180, 60);
@ -81,9 +85,7 @@ main (int argc, char *argv[])
CLUTTER_ALPHA_RAMP_INC, CLUTTER_ALPHA_RAMP_INC,
NULL, NULL), NULL, NULL),
-500, 0); -500, 0);
clutter_behaviour_apply (d_behave, hand); clutter_behaviour_apply (d_behave, group);
clutter_behaviour_apply (d_behave, label);
clutter_behaviour_apply (d_behave, rect);
clutter_actor_show (stage); clutter_actor_show (stage);