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

drag-action: don't mix touch and pointer events

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=709762
This commit is contained in:
Lionel Landwerlin 2013-10-09 18:39:59 +01:00 committed by Emmanuele Bassi
parent 7c2b88f73b
commit f70eee0748
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/clutter-drag-action.c
View File

@ -364,14 +364,14 @@ on_captured_event (ClutterActor *stage,
if (!priv->in_drag) if (!priv->in_drag)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
if (clutter_event_get_device (event) != priv->device) if (clutter_event_get_device (event) != priv->device ||
clutter_event_get_event_sequence (event) != priv->sequence)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
switch (clutter_event_type (event)) switch (clutter_event_type (event))
{ {
case CLUTTER_TOUCH_UPDATE: case CLUTTER_TOUCH_UPDATE:
if (clutter_event_get_event_sequence (event) == priv->sequence) emit_drag_motion (action, actor, event);
emit_drag_motion (action, actor, event);
break; break;
case CLUTTER_MOTION: case CLUTTER_MOTION:
@ -391,8 +391,7 @@ on_captured_event (ClutterActor *stage,
case CLUTTER_TOUCH_END: case CLUTTER_TOUCH_END:
case CLUTTER_TOUCH_CANCEL: case CLUTTER_TOUCH_CANCEL:
if (clutter_event_get_event_sequence (event) == priv->sequence) emit_drag_end (action, actor, event);
emit_drag_end (action, actor, event);
break; break;
case CLUTTER_BUTTON_RELEASE: case CLUTTER_BUTTON_RELEASE:
@ -427,6 +426,8 @@ on_drag_begin (ClutterActor *actor,
switch (clutter_event_type (event)) switch (clutter_event_type (event))
{ {
case CLUTTER_BUTTON_PRESS: case CLUTTER_BUTTON_PRESS:
if (priv->sequence != NULL)
return CLUTTER_EVENT_PROPAGATE;
if (clutter_event_get_button (event) != CLUTTER_BUTTON_PRIMARY) if (clutter_event_get_button (event) != CLUTTER_BUTTON_PRIMARY)
return CLUTTER_EVENT_PROPAGATE; return CLUTTER_EVENT_PROPAGATE;
break; break;