firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "LiveTestWidgetsFlutterBinding support for non-touch event (#61872)" (#61900)

Browse Source 
This reverts commit aa4b4d35e1187483fec4ec71fc278e724257cd77.
This commit is contained in:
Ming Lyu (CareF) 2020-07-20 17:20:30 -04:00 committed by GitHub
parent 07caa0fbfe
commit f98a00c750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/flutter_test/lib/src/binding.dart
View File

@ -1468,11 +1468,6 @@ class LiveTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
/// Events dispatched by [TestGesture] are not affected by this. /// Events dispatched by [TestGesture] are not affected by this.
HitTestDispatcher deviceEventDispatcher; HitTestDispatcher deviceEventDispatcher;
/// Dispatch an event to a hit test result's path.
///
/// Apart from forwarding the event to [GestureBinding.dispatchEvent],
/// This also paint all events that's down on the screen.
@override @override
void dispatchEvent( void dispatchEvent(
PointerEvent event, PointerEvent event,
@ -1481,19 +1476,20 @@ class LiveTestWidgetsFlutterBinding extends TestWidgetsFlutterBinding {
}) { }) {
switch (source) { switch (source) {
case TestBindingEventSource.test: case TestBindingEventSource.test:
if (renderView._pointers.containsKey(event.pointer)) { if (!renderView._pointers.containsKey(event.pointer)) {
assert(event.down || event is PointerAddedEvent);
if (event.down) {
renderView._pointers[event.pointer] = _LiveTestPointerRecord(
event.pointer,
event.position,
);
}
} else {
renderView._pointers[event.pointer].position = event.position; renderView._pointers[event.pointer].position = event.position;
if (!event.down) if (!event.down)
renderView._pointers[event.pointer].decay = _kPointerDecay; renderView._pointers[event.pointer].decay = _kPointerDecay;
_handleViewNeedsPaint();
} else if (event.down) {
assert(event is PointerDownEvent);
renderView._pointers[event.pointer] = _LiveTestPointerRecord(
event.pointer,
event.position,
);
_handleViewNeedsPaint();
} }
_handleViewNeedsPaint();
super.dispatchEvent(event, hitTestResult, source: source); super.dispatchEvent(event, hitTestResult, source: source);
break; break;
case TestBindingEventSource.device: case TestBindingEventSource.device:

13
packages/flutter_test/test/live_binding_test.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
@ -18,15 +16,4 @@ void main() {
// starts with a PointerAddedEvent. // starts with a PointerAddedEvent.
await gesture.addPointer(); await gesture.addPointer();
}); });
testWidgets('Input PointerHoverEvent', (WidgetTester tester) async {
await tester.pumpWidget(const MaterialApp(home: Text('Test')));
await tester.pump();
final TestGesture gesture = await tester.createGesture(
kind: PointerDeviceKind.mouse);
final Offset location = tester.getCenter(find.text('Test'));
// for mouse input without a down event, moveTo generates a hover event
await gesture.moveTo(location);
await gesture.removePointer();
});
} }