sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

test-state: move press/release callbacks to stage avoiding grab

Browse source
This commit is contained in:
Øyvind Kolås 2010-05-25 11:54:15 +01:00
parent b8b10ef4db
commit 66de8656e9
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/interactive/test-state.c
View file

@ -19,7 +19,6 @@ static gboolean press_event (ClutterActor *actor,
gpointer user_data) gpointer user_data)
{ {
ClutterState *state = CLUTTER_STATE (user_data); ClutterState *state = CLUTTER_STATE (user_data);
clutter_grab_pointer (actor);
clutter_state_change (state, "right", TRUE); clutter_state_change (state, "right", TRUE);
return TRUE; return TRUE;
} }
@ -30,7 +29,6 @@ static gboolean release_event (ClutterActor *actor,
{ {
ClutterState *state = CLUTTER_STATE (user_data); ClutterState *state = CLUTTER_STATE (user_data);
clutter_state_change (state, "active", TRUE); clutter_state_change (state, "active", TRUE);
clutter_ungrab_pointer ();
return TRUE; return TRUE;
} }
@ -105,6 +103,10 @@ test_state_main (gint argc,
clutter_stage_set_color (CLUTTER_STAGE (stage), &black); clutter_stage_set_color (CLUTTER_STAGE (stage), &black);
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT); clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
g_signal_connect (stage, "button-press-event",
G_CALLBACK (press_event), layout_state);
g_signal_connect (stage, "button-release-event",
G_CALLBACK (release_event), layout_state);
for (i=0; i<TOTAL; i++) for (i=0; i<TOTAL; i++)
{ {
@ -120,10 +122,6 @@ test_state_main (gint argc,
clutter_actor_set_position (actor, 320.0, 240.0); clutter_actor_set_position (actor, 320.0, 240.0);
clutter_actor_set_reactive (actor, TRUE); clutter_actor_set_reactive (actor, TRUE);
g_signal_connect (actor, "button-press-event",
G_CALLBACK (press_event), layout_state);
g_signal_connect (actor, "button-release-event",
G_CALLBACK (release_event), layout_state);
clutter_state_set (layout_state, NULL, "active", clutter_state_set (layout_state, NULL, "active",
actor, "delayed::x", CLUTTER_LINEAR, actor, "delayed::x", CLUTTER_LINEAR,