summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Dreßler <verdre@v0yd.nl>2020-03-03 21:50:45 +0100
committerverdre <jonas@dressler.it>2020-06-16 10:09:26 +0000
commitcb0cc42651dcc6366dc88b37ff38eac1eef99e35 (patch)
treeb081c588d0a74fc317a6adb0f81fe6f4bd7ef70d
parentb36cfb5bdcfe6c176cdee9b053d2426d8d0586c9 (diff)
downloadmutter-cb0cc42651dcc6366dc88b37ff38eac1eef99e35.tar.gz
clutter: Also remove event sequences on TOUCH_CANCEL events
We don't want to leave event sequences around when touches are cancelled, so also remove those from the ClutterInputDevice's hashtable. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1275
-rw-r--r--clutter/clutter/clutter-main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 84a10bb5d..9db080931 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -2049,7 +2049,8 @@ _clutter_process_event_details (ClutterActor *stage,
emit_touch_event (event, device);
- if (event->type == CLUTTER_TOUCH_END)
+ if (event->type == CLUTTER_TOUCH_END ||
+ event->type == CLUTTER_TOUCH_CANCEL)
_clutter_input_device_remove_event_sequence (device, event);
break;
@@ -2084,7 +2085,8 @@ _clutter_process_event_details (ClutterActor *stage,
emit_touch_event (event, device);
- if (event->type == CLUTTER_TOUCH_END)
+ if (event->type == CLUTTER_TOUCH_END ||
+ event->type == CLUTTER_TOUCH_CANCEL)
_clutter_input_device_remove_event_sequence (device, event);
break;