Unverified Commit 5bd3de7c authored by Callum Moffat's avatar Callum Moffat Committed by GitHub

Allow trackpad inertia cancel events (#108190)

parent 9c34ec41
...@@ -1718,7 +1718,7 @@ abstract class PointerSignalEvent extends PointerEvent { ...@@ -1718,7 +1718,7 @@ abstract class PointerSignalEvent extends PointerEvent {
super.device, super.device,
super.position, super.position,
super.embedderId, super.embedderId,
}) : assert(!identical(kind, PointerDeviceKind.trackpad)); });
} }
mixin _CopyPointerScrollEvent on PointerEvent { mixin _CopyPointerScrollEvent on PointerEvent {
...@@ -1787,7 +1787,8 @@ class PointerScrollEvent extends PointerSignalEvent with _PointerEventDescriptio ...@@ -1787,7 +1787,8 @@ class PointerScrollEvent extends PointerSignalEvent with _PointerEventDescriptio
assert(kind != null), assert(kind != null),
assert(device != null), assert(device != null),
assert(position != null), assert(position != null),
assert(scrollDelta != null); assert(scrollDelta != null),
assert(!identical(kind, PointerDeviceKind.trackpad));
@override @override
final Offset scrollDelta; final Offset scrollDelta;
......
...@@ -848,12 +848,14 @@ void main() { ...@@ -848,12 +848,14 @@ void main() {
test('Ensure certain event types are allowed', () { test('Ensure certain event types are allowed', () {
// Regression test for https://github.com/flutter/flutter/issues/107962 // Regression test for https://github.com/flutter/flutter/issues/107962
expect(const PointerHoverEvent(kind: PointerDeviceKind.trackpad), isNotNull); expect(const PointerHoverEvent(kind: PointerDeviceKind.trackpad), isNotNull);
// Regression test for https://github.com/flutter/flutter/issues/108176
expect(const PointerScrollInertiaCancelEvent(kind: PointerDeviceKind.trackpad), isNotNull);
// The test passes if it compiles. // The test passes if it compiles.
}); });
test('Ensure certain event types are not allowed', () { test('Ensure certain event types are not allowed', () {
expect(() => PointerDownEvent(kind: PointerDeviceKind.trackpad), throwsAssertionError); expect(() => PointerDownEvent(kind: PointerDeviceKind.trackpad), throwsAssertionError);
expect(() => PointerScrollEvent(kind: PointerDeviceKind.trackpad), throwsAssertionError);
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment