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

2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* tests/test-layout.c: Take into account the origin of the
	parent, if it has changed, and queue a relayout if we are
	using the transformed box when computing the layout.
This commit is contained in:
Emmanuele Bassi 2008-06-11 17:34:35 +00:00
parent 6b1a9fd52b
commit 895bbc59e5
2 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>
* tests/test-layout.c: Take into account the origin of the
parent, if it has changed, and queue a relayout if we are
using the transformed box when computing the layout.
2008-06-11 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglnative/clutter-stage-egl.c: Remove a duplicate * clutter/eglnative/clutter-stage-egl.c: Remove a duplicate

58
tests/test-layout.c
View File

@ -370,7 +370,7 @@ my_thing_get_preferred_height (ClutterActor *self,
static void static void
my_thing_allocate (ClutterActor *self, my_thing_allocate (ClutterActor *self,
const ClutterActorBox *box, const ClutterActorBox *box,
gboolean absolute_origin_changed) gboolean origin_changed)
{ {
MyThingPrivate *priv; MyThingPrivate *priv;
ClutterUnit current_x, current_y, max_row_height; ClutterUnit current_x, current_y, max_row_height;
@ -378,7 +378,7 @@ my_thing_allocate (ClutterActor *self,
/* chain up to set actor->allocation */ /* chain up to set actor->allocation */
CLUTTER_ACTOR_CLASS (my_thing_parent_class)->allocate (self, box, CLUTTER_ACTOR_CLASS (my_thing_parent_class)->allocate (self, box,
absolute_origin_changed); origin_changed);
priv = MY_THING (self)->priv; priv = MY_THING (self)->priv;
@ -417,7 +417,7 @@ my_thing_allocate (ClutterActor *self,
child_box.x2 = child_box.x1 + natural_width; child_box.x2 = child_box.x1 + natural_width;
child_box.y2 = child_box.y1 + natural_height; child_box.y2 = child_box.y1 + natural_height;
clutter_actor_allocate (child, &child_box, absolute_origin_changed); clutter_actor_allocate (child, &child_box, origin_changed);
/* if we take into account the transformation of the children /* if we take into account the transformation of the children
* then we first check if it's transformed; then we get the * then we first check if it's transformed; then we get the
@ -431,24 +431,33 @@ my_thing_allocate (ClutterActor *self,
clutter_actor_is_rotated (child)) clutter_actor_is_rotated (child))
{ {
ClutterVertex v1 = { 0, }, v2 = { 0, }; ClutterVertex v1 = { 0, }, v2 = { 0, };
ClutterActorBox box = { 0, }; ClutterActorBox transformed_box = { 0, };
/* origin */ /* origin */
v1.x = 0; if (!origin_changed)
v1.y = 0; {
v1.x = 0;
v1.y = 0;
}
else
{
v1.x = box->x1;
v1.y = box->y1;
}
clutter_actor_apply_transform_to_point (child, &v1, &v2); clutter_actor_apply_transform_to_point (child, &v1, &v2);
box.x1 = v2.x; transformed_box.x1 = v2.x;
box.y1 = v2.y; transformed_box.y1 = v2.y;
/* size */ /* size */
v1.x = natural_width; v1.x = natural_width;
v1.y = natural_height; v1.y = natural_height;
clutter_actor_apply_transform_to_point (child, &v1, &v2); clutter_actor_apply_transform_to_point (child, &v1, &v2);
box.x2 = v2.x; transformed_box.x2 = v2.x;
box.y2 = v2.y; transformed_box.y2 = v2.y;
natural_width = box.x2 - box.x1; natural_width = transformed_box.x2 - transformed_box.x1;
natural_height = box.y2 - box.y1; natural_height = transformed_box.y2 - transformed_box.y1;
} }
} }
@ -713,6 +722,26 @@ keypress_cb (ClutterStage *stage,
} }
} }
static void
relayout_on_frame (ClutterTimeline *timeline)
{
gboolean use_transformed_box;
/* if we care about transformations updating the layout, we need to inform
* the layout that a transformation is happening; this is either done by
* attaching a notification on the transformation properties or by simply
* queuing a relayout on each frame of the timeline used to drive the
* behaviour. for simplicity's sake, we used the latter
*/
g_object_get (G_OBJECT (box),
"use-transformed-box", &use_transformed_box,
NULL);
if (use_transformed_box)
clutter_actor_queue_relayout (box);
}
int int
main (int argc, main (int argc,
char *argv[]) char *argv[])
@ -730,6 +759,9 @@ main (int argc,
timeline = clutter_timeline_new_for_duration (2000); timeline = clutter_timeline_new_for_duration (2000);
clutter_timeline_set_loop (timeline, TRUE); clutter_timeline_set_loop (timeline, TRUE);
g_signal_connect (timeline, "new-frame",
G_CALLBACK (relayout_on_frame),
NULL);
behaviour = clutter_behaviour_scale_new (clutter_alpha_new_full (timeline, behaviour = clutter_behaviour_scale_new (clutter_alpha_new_full (timeline,
CLUTTER_ALPHA_SINE, CLUTTER_ALPHA_SINE,
@ -739,7 +771,7 @@ main (int argc,
box = my_thing_new (10, 10); box = my_thing_new (10, 10);
clutter_actor_set_position (box, 20, 20); clutter_actor_set_position (box, 20, 20);
clutter_actor_set_size (box, 400, -1); clutter_actor_set_size (box, 350, -1);
icon = clutter_texture_new_from_file ("redhand.png", &error); icon = clutter_texture_new_from_file ("redhand.png", &error);
if (error) if (error)