From 53b6d4abb1440e417161602431cebd2c14f7aaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Mon, 5 Dec 2022 23:12:33 +0100 Subject: [PATCH] clutter/gesture-action: Let lower layers cancel gesture on stage grab Since the last commit, ClutterStage automatically cancels an implicit grab (including all its ClutterActions) when a conflicting ClutterGrab appears. This means we no longer have to look out for GRAB_NOTIFY crossings in ClutterGestureAction and can instead depend on the sequence_cancelled() vfunc for this. Part-of: --- clutter/clutter/clutter-gesture-action.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/clutter/clutter/clutter-gesture-action.c b/clutter/clutter/clutter-gesture-action.c index d48e68358..ba843033d 100644 --- a/clutter/clutter/clutter-gesture-action.c +++ b/clutter/clutter/clutter-gesture-action.c @@ -382,16 +382,6 @@ clutter_gesture_action_handle_event (ClutterAction *action, { case CLUTTER_ENTER: case CLUTTER_LEAVE: - if (point && - event_type == CLUTTER_LEAVE && - (event->crossing.flags & CLUTTER_EVENT_FLAG_GRAB_NOTIFY) != 0) - { - gesture_unregister_point (gesture_action, position); - - if (priv->in_gesture) - cancel_gesture (gesture_action); - } - return CLUTTER_EVENT_PROPAGATE; case CLUTTER_BUTTON_PRESS: