From 3b19dfd4da378fc6333f56d034c7eb1312896a6c Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 18 May 2021 20:28:06 -0700 Subject: [PATCH] Fix addAllowedPointer() overrides (#82834) They should have been taking a PointerDownEvent. This change was originally included in #81884, but that had to be reverted because it broke Google testss. This sub-part of that larger change needs to be made first in order to allow for a phased rollout in a way that won't break Google tests. https://github.com/flutter/flutter/issues/81883 --- packages/flutter/lib/src/gestures/force_press.dart | 2 +- packages/flutter/lib/src/gestures/monodrag.dart | 2 +- packages/flutter/lib/src/gestures/multitap.dart | 2 +- packages/flutter/lib/src/gestures/scale.dart | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flutter/lib/src/gestures/force_press.dart b/packages/flutter/lib/src/gestures/force_press.dart index 4da8cf5d8a8..2697815671a 100644 --- a/packages/flutter/lib/src/gestures/force_press.dart +++ b/packages/flutter/lib/src/gestures/force_press.dart @@ -216,7 +216,7 @@ class ForcePressGestureRecognizer extends OneSequenceGestureRecognizer { _ForceState _state = _ForceState.ready; @override - void addAllowedPointer(PointerEvent event) { + void addAllowedPointer(PointerDownEvent event) { // If the device has a maximum pressure of less than or equal to 1, it // doesn't have touch pressure sensing capabilities. Do not participate // in the gesture arena. diff --git a/packages/flutter/lib/src/gestures/monodrag.dart b/packages/flutter/lib/src/gestures/monodrag.dart index 6e14b94041f..5857aac82dd 100644 --- a/packages/flutter/lib/src/gestures/monodrag.dart +++ b/packages/flutter/lib/src/gestures/monodrag.dart @@ -262,7 +262,7 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer { } @override - void addAllowedPointer(PointerEvent event) { + void addAllowedPointer(PointerDownEvent event) { startTrackingPointer(event.pointer, event.transform); _velocityTrackers[event.pointer] = velocityTrackerBuilder(event); if (_state == _DragState.ready) { diff --git a/packages/flutter/lib/src/gestures/multitap.dart b/packages/flutter/lib/src/gestures/multitap.dart index 0478a44c00f..83abd2da03e 100644 --- a/packages/flutter/lib/src/gestures/multitap.dart +++ b/packages/flutter/lib/src/gestures/multitap.dart @@ -507,7 +507,7 @@ class MultiTapGestureRecognizer extends GestureRecognizer { final Map _gestureMap = {}; @override - void addAllowedPointer(PointerEvent event) { + void addAllowedPointer(PointerDownEvent event) { assert(!_gestureMap.containsKey(event.pointer)); _gestureMap[event.pointer] = _TapGesture( gestureRecognizer: this, diff --git a/packages/flutter/lib/src/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart index 7e7e742b828..61b0a0d10e5 100644 --- a/packages/flutter/lib/src/gestures/scale.dart +++ b/packages/flutter/lib/src/gestures/scale.dart @@ -350,7 +350,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer { } @override - void addAllowedPointer(PointerEvent event) { + void addAllowedPointer(PointerDownEvent event) { startTrackingPointer(event.pointer, event.transform); _velocityTrackers[event.pointer] = VelocityTracker.withKind(event.kind); if (_state == _ScaleState.ready) {