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

gesture-action: Use the event propagation macros

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-01-12 10:49:02 +00:00
parent d83fbd7bdf
commit 3b9b69ef54
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
clutter/clutter-gesture-action.c
View File

@ -142,7 +142,7 @@ stage_captured_event_cb (ClutterActor *stage,
if (!(mods & CLUTTER_BUTTON1_MASK))
{
cancel_gesture (action);
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
clutter_event_get_coords (event, &priv->last_motion_x,
@ -152,7 +152,7 @@ stage_captured_event_cb (ClutterActor *stage,
priv->last_motion_x,
priv->last_motion_y,
NULL, NULL))
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
if (!priv->in_drag)
{
@ -173,11 +173,11 @@ stage_captured_event_cb (ClutterActor *stage,
if (!return_value)
{
cancel_gesture (action);
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
}
else
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
g_signal_emit (action, gesture_signals[GESTURE_PROGRESS], 0, actor,
@ -185,7 +185,7 @@ stage_captured_event_cb (ClutterActor *stage,
if (!return_value)
{
cancel_gesture (action);
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
}
break;
@ -209,7 +209,7 @@ stage_captured_event_cb (ClutterActor *stage,
break;
}
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
static gboolean
@ -220,10 +220,10 @@ actor_captured_event_cb (ClutterActor *actor,
ClutterGestureActionPrivate *priv = action->priv;
if (clutter_event_type (event) != CLUTTER_BUTTON_PRESS)
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
if (!clutter_actor_meta_get_enabled (CLUTTER_ACTOR_META (action)))
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
clutter_event_get_coords (event, &priv->press_x, &priv->press_y);
@ -235,7 +235,7 @@ actor_captured_event_cb (ClutterActor *actor,
G_CALLBACK (stage_captured_event_cb),
action);
return FALSE;
return CLUTTER_EVENT_PROPAGATE;
}
static void