mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 01:50:42 -05:00
gesture-action: Use event type getter
Don't use direct struct access.
This commit is contained in:
parent
02590f08ac
commit
036c2b3764
@ -352,8 +352,8 @@ begin_gesture (ClutterGestureAction *action,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
stage_captured_event_cb (ClutterActor *stage,
|
stage_captured_event_cb (ClutterActor *stage,
|
||||||
ClutterEvent *event,
|
ClutterEvent *event,
|
||||||
ClutterGestureAction *action)
|
ClutterGestureAction *action)
|
||||||
{
|
{
|
||||||
ClutterGestureActionPrivate *priv = action->priv;
|
ClutterGestureActionPrivate *priv = action->priv;
|
||||||
@ -362,10 +362,14 @@ stage_captured_event_cb (ClutterActor *stage,
|
|||||||
float threshold_x, threshold_y;
|
float threshold_x, threshold_y;
|
||||||
gboolean return_value;
|
gboolean return_value;
|
||||||
GesturePoint *point;
|
GesturePoint *point;
|
||||||
|
ClutterEventType event_type;
|
||||||
|
|
||||||
if (event->type != CLUTTER_TOUCH_CANCEL &&
|
event_type = clutter_event_type (event);
|
||||||
event->type != CLUTTER_TOUCH_UPDATE && event->type != CLUTTER_TOUCH_END &&
|
if (event_type != CLUTTER_TOUCH_CANCEL &&
|
||||||
event->type != CLUTTER_MOTION && event->type != CLUTTER_BUTTON_RELEASE)
|
event_type != CLUTTER_TOUCH_UPDATE &&
|
||||||
|
event_type != CLUTTER_TOUCH_END &&
|
||||||
|
event_type != CLUTTER_MOTION &&
|
||||||
|
event_type != CLUTTER_BUTTON_RELEASE)
|
||||||
return CLUTTER_EVENT_PROPAGATE;
|
return CLUTTER_EVENT_PROPAGATE;
|
||||||
|
|
||||||
if ((point = gesture_find_point (action, event, &position)) == NULL)
|
if ((point = gesture_find_point (action, event, &position)) == NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user