mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 18:11:05 -05:00
473d0e9fc3
Bug #815 - Split up request, allocation, and paint box * clutter/clutter-actor.[ch]: Rework the size allocation, request and paint area. Now ::request_coords() is called ::allocate(), and ::query_coords() has been split into ::get_preferred_width() and ::get_preferred_height(). See the documentation and the layout test on how to implement a container and layout manager with the new API. (#915, based on a patch by Havoc Pennington, Lucas Rocha and Johan Bilien) * clutter/clutter-clone-texture.c: Port CloneTexture to the new size negotiation API; it just means forwarding the requests to the parent texture. * clutter/clutter-deprecated.h: Add deprecated and replaced API. * clutter/clutter-entry.c: Port Entry to the new size negotiation API. * clutter/clutter-group.c: Port Group to the new size negotiation API; the semantics of the Group actor do not change. * clutter/clutter-label.c: Port Label to the new size negotiation API, and vastly simplify the code. * clutter/clutter-main.[ch]: Add API for executing a relayout when needed. * clutter/clutter-private.h: Add new Stage private API. * clutter/clutter-rectangle.c: Update the get_abs_opacity() call to get_paint_opacity(). * clutter/clutter-stage.c: (clutter_stage_get_preferred_width), (clutter_stage_get_preferred_height), (clutter_stage_allocate), (clutter_stage_class_init): Port Stage to the new size negotiation API. * clutter/clutter-texture.c: Port Texture to the new size negotiation API. * clutter/clutter-types.h: Add ClutterRequestMode enumeration. * clutter/x11/clutter-stage-x11.c: Port the X11 stage implementation to the new size negotiation API. * tests/Makefile.am: Add the layout manager test case. * tests/test-opacity.c: Update. * tests/test-project.c: Update. * tests/test-layout.c: Test case for a layout manager implemented using the new size negotiation API; the layout manager handles both transformed and untransformed children.
241 lines
5.4 KiB
C
241 lines
5.4 KiB
C
#include <clutter/clutter.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
static ClutterActor *main_stage, *rect, *p[5];
|
|
|
|
static void
|
|
init_handles ()
|
|
{
|
|
gint i;
|
|
ClutterVertex v[4];
|
|
ClutterVertex v1, v2;
|
|
ClutterColor blue = { 0, 0, 0xff, 0xff };
|
|
|
|
clutter_actor_get_abs_allocation_vertices (rect, v);
|
|
for (i = 0; i < 4; ++i)
|
|
{
|
|
p[i] = clutter_rectangle_new_with_color (&blue);
|
|
clutter_actor_set_size (p[i], 5, 5);
|
|
clutter_actor_set_position (p[i], 0, 0);
|
|
clutter_group_add (CLUTTER_GROUP (main_stage), p[i]);
|
|
|
|
clutter_actor_set_position (p[i],
|
|
CLUTTER_FIXED_INT (v[i].x) -
|
|
clutter_actor_get_width (p[i])/2,
|
|
CLUTTER_FIXED_INT (v[i].y) -
|
|
clutter_actor_get_height (p[i])/2);
|
|
|
|
clutter_actor_raise_top (p[i]);
|
|
|
|
clutter_actor_show (p[i]);
|
|
}
|
|
|
|
v1.x = CLUTTER_INT_TO_FIXED (clutter_actor_get_width (rect)/2);
|
|
v1.y = CLUTTER_INT_TO_FIXED (clutter_actor_get_height (rect)/2);
|
|
v1.z = 0;
|
|
|
|
clutter_actor_apply_transform_to_point (rect, &v1, &v2);
|
|
p[4] = clutter_rectangle_new_with_color (&blue);
|
|
clutter_actor_set_size (p[4], 5, 5);
|
|
clutter_actor_set_position (p[4], 0, 0);
|
|
clutter_group_add (CLUTTER_GROUP (main_stage), p[4]);
|
|
clutter_actor_set_position (p[4],
|
|
CLUTTER_FIXED_INT (v2.x) -
|
|
clutter_actor_get_width (p[4])/2,
|
|
CLUTTER_FIXED_INT (v2.y) -
|
|
clutter_actor_get_height (p[4])/2);
|
|
|
|
clutter_actor_raise_top (p[4]);
|
|
|
|
clutter_actor_show (p[4]);
|
|
}
|
|
|
|
static void
|
|
place_handles ()
|
|
{
|
|
gint i;
|
|
ClutterVertex v[4];
|
|
ClutterVertex v1, v2;
|
|
|
|
clutter_actor_get_abs_allocation_vertices (rect, v);
|
|
for (i = 0; i < 4; ++i)
|
|
{
|
|
clutter_actor_set_position (p[i],
|
|
CLUTTER_FIXED_INT (v[i].x) -
|
|
clutter_actor_get_width (p[i])/2,
|
|
CLUTTER_FIXED_INT (v[i].y) -
|
|
clutter_actor_get_height (p[i])/2);
|
|
}
|
|
|
|
v1.x = CLUTTER_INT_TO_FIXED (clutter_actor_get_width (rect)/2);
|
|
v1.y = CLUTTER_INT_TO_FIXED (clutter_actor_get_height (rect)/2);
|
|
v1.z = 0;
|
|
|
|
clutter_actor_apply_transform_to_point (rect, &v1, &v2);
|
|
clutter_actor_set_position (p[4],
|
|
CLUTTER_FIXED_INT (v2.x) -
|
|
clutter_actor_get_width (p[4])/2,
|
|
CLUTTER_FIXED_INT (v2.y) -
|
|
clutter_actor_get_height (p[4])/2);
|
|
}
|
|
|
|
#define M(m,row,col) (m)[col*4+row]
|
|
|
|
static gint
|
|
find_handle_index (ClutterActor * a)
|
|
{
|
|
gint i;
|
|
for (i = 0; i < sizeof(p)/sizeof(p[0]); ++i)
|
|
if (p[i] == a)
|
|
return i;
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
void
|
|
on_event (ClutterStage *stage,
|
|
ClutterEvent *event,
|
|
gpointer user_data)
|
|
{
|
|
static ClutterActor * dragging = NULL;
|
|
|
|
switch (event->type)
|
|
{
|
|
case CLUTTER_BUTTON_PRESS:
|
|
{
|
|
gint x, y;
|
|
ClutterActor * actor;
|
|
|
|
clutter_event_get_coords (event, &x, &y);
|
|
|
|
actor = clutter_stage_get_actor_at_pos (stage, x, y);
|
|
|
|
if (actor != CLUTTER_ACTOR (stage))
|
|
{
|
|
if (actor != rect)
|
|
dragging = actor;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case CLUTTER_MOTION:
|
|
{
|
|
if (dragging)
|
|
{
|
|
gint x, y;
|
|
gint i;
|
|
ClutterActorBox box1, box2;
|
|
ClutterFixed xp, yp;
|
|
|
|
i = find_handle_index (dragging);
|
|
|
|
if (i < 0)
|
|
break;
|
|
|
|
clutter_event_get_coords (event, &x, &y);
|
|
|
|
clutter_actor_get_allocation_box (dragging, &box1);
|
|
clutter_actor_get_allocation_box (rect, &box2);
|
|
|
|
xp = CLUTTER_INT_TO_FIXED (x-3) - box1.x1;
|
|
yp = CLUTTER_INT_TO_FIXED (y-3) - box1.y1;
|
|
|
|
if (i == 4)
|
|
{
|
|
g_debug ("moving box by %f, %f",
|
|
CLUTTER_FIXED_TO_FLOAT (xp),
|
|
CLUTTER_FIXED_TO_FLOAT (yp));
|
|
|
|
clutter_actor_move_by (rect,
|
|
CLUTTER_FIXED_INT(xp),
|
|
CLUTTER_FIXED_INT(yp));
|
|
}
|
|
else
|
|
{
|
|
g_debug ("adjusting box by %f, %f, handle %d",
|
|
CLUTTER_FIXED_TO_FLOAT (xp),
|
|
CLUTTER_FIXED_TO_FLOAT (yp),
|
|
i);
|
|
switch (i)
|
|
{
|
|
case 0:
|
|
box2.x1 += xp;
|
|
box2.y1 += yp;
|
|
break;
|
|
case 1:
|
|
box2.x2 += xp;
|
|
box2.y1 += yp;
|
|
break;
|
|
case 2:
|
|
box2.x1 += xp;
|
|
box2.y2 += yp;
|
|
break;
|
|
case 3:
|
|
box2.x2 += xp;
|
|
box2.y2 += yp;
|
|
break;
|
|
}
|
|
|
|
/* FIXME this is just plain wrong, to allocate directly
|
|
* like this
|
|
*/
|
|
clutter_actor_allocate (rect, &box2, TRUE);
|
|
}
|
|
|
|
place_handles ();
|
|
}
|
|
}
|
|
break;
|
|
|
|
case CLUTTER_BUTTON_RELEASE:
|
|
{
|
|
dragging = NULL;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
ClutterActor *label;
|
|
|
|
ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff },
|
|
white = { 0xff, 0xff, 0xff, 0xff };
|
|
|
|
clutter_init (&argc, &argv);
|
|
|
|
main_stage = clutter_stage_get_default ();
|
|
|
|
clutter_stage_set_color (CLUTTER_STAGE (main_stage), &stage_color);
|
|
clutter_actor_set_size (main_stage, 640, 480);
|
|
|
|
rect = clutter_rectangle_new_with_color (&white);
|
|
clutter_actor_set_size (rect, 320, 240);
|
|
clutter_actor_set_position (rect, 180, 120);
|
|
clutter_actor_set_rotation (rect, CLUTTER_Y_AXIS, 60, 0, 0, 0);
|
|
clutter_group_add (CLUTTER_GROUP (main_stage), rect);
|
|
|
|
label = clutter_label_new_with_text ("Mono 8pt", "Drag the blue rectangles");
|
|
clutter_label_set_color (CLUTTER_LABEL (label), &white);
|
|
|
|
clutter_actor_set_position (label, 10, 10);
|
|
clutter_group_add (CLUTTER_GROUP (main_stage), label);
|
|
|
|
clutter_actor_show_all (main_stage);
|
|
|
|
g_signal_connect (main_stage, "event", G_CALLBACK (on_event), NULL);
|
|
|
|
init_handles ();
|
|
|
|
clutter_main();
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|