isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-02 04:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

[tests] Fix the actor detection

Browse Source 
The test-unproject interactive test assumed that only the rectangle was
on the stage. As it turns out, labels can be picked as well.
This commit is contained in:
Emmanuele Bassi 2008-12-19 13:03:53 +00:00
parent cdb78ec4d2
commit f6e9a701e4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/interactive/test-unproject.c
View File

@ -5,13 +5,15 @@
#include <string.h> #include <string.h>
#include <gmodule.h> #include <gmodule.h>
ClutterActor *label;
#define RECT_L 200 #define RECT_L 200
#define RECT_T 150 #define RECT_T 150
#define RECT_W 320 #define RECT_W 320
#define RECT_H 240 #define RECT_H 240
static ClutterActor *test_rectangle = NULL;
static ClutterActor *label = NULL;
static gboolean static gboolean
on_event (ClutterStage *stage, on_event (ClutterStage *stage,
ClutterEvent *event, ClutterEvent *event,
@ -29,15 +31,14 @@ on_event (ClutterStage *stage,
actor = clutter_stage_get_actor_at_pos (stage, x, y); actor = clutter_stage_get_actor_at_pos (stage, x, y);
if (clutter_actor_transform_stage_point (actor, if (clutter_actor_transform_stage_point (actor,
CLUTTER_UNITS_FROM_DEVICE (x), CLUTTER_UNITS_FROM_DEVICE (x),
CLUTTER_UNITS_FROM_DEVICE (y), CLUTTER_UNITS_FROM_DEVICE (y),
&xu2, &yu2)) &xu2, &yu2))
{ {
gchar *txt; gchar *txt;
if (actor != CLUTTER_ACTOR (stage)) if (actor == test_rectangle)
txt = g_strdup_printf ("Click on rectangle\n" txt = g_strdup_printf ("Click on rectangle\n"
"Screen coords: [%d, %d]\n" "Screen coords: [%d, %d]\n"
"Local coords : [%d, %d]", "Local coords : [%d, %d]",
@ -117,6 +118,7 @@ test_unproject_main (int argc, char *argv[])
clutter_actor_set_rotation (rect, CLUTTER_Y_AXIS, rotate_y, 0, 0, 0); clutter_actor_set_rotation (rect, CLUTTER_Y_AXIS, rotate_y, 0, 0, 0);
clutter_actor_set_rotation (rect, CLUTTER_Z_AXIS, rotate_z, 0, 0, 0); clutter_actor_set_rotation (rect, CLUTTER_Z_AXIS, rotate_z, 0, 0, 0);
clutter_group_add (CLUTTER_GROUP (stage), rect); clutter_group_add (CLUTTER_GROUP (stage), rect);
test_rectangle = rect;
txt = g_strdup_printf ("Rectangle: L %d, R %d, T %d, B %d\n" txt = g_strdup_printf ("Rectangle: L %d, R %d, T %d, B %d\n"
"Rotation : x %d, y %d, z %d", "Rotation : x %d, y %d, z %d",
@ -146,5 +148,8 @@ test_unproject_main (int argc, char *argv[])
clutter_main(); clutter_main();
test_rectangle = NULL;
label = NULL;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }