DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #355 from Hixie/tap-bugs

Browse Source 
Fix tapcancel on slop.
This commit is contained in:
Ian Hickson 2015-11-12 22:22:42 -08:00
commit fc5832dcdf
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/gestures/arena.dart
View File

@ -146,8 +146,7 @@ class GestureArena {
} else {
assert(disposition == GestureDisposition.accepted);
if (state.isOpen) {
if (state.eagerWinner == null)
state.eagerWinner = member;
state.eagerWinner ??= member;
} else {
_resolveInFavorOf(key, state, member);
}
@ -166,4 +165,4 @@ class GestureArena {
}
member.acceptGesture(key);
}
}
}

2
packages/flutter/lib/src/gestures/recognizer.dart
View File

@ -112,7 +112,7 @@ abstract class PrimaryPointerGestureRecognizer extends OneSequenceGestureRecogni
// TODO(abarth): Maybe factor the slop handling out into a separate class?
if (event.type == 'pointermove' && _getDistance(event) > kTouchSlop) {
resolve(GestureDisposition.rejected);
stopTrackingPointer(event.pointer);
stopTrackingPointer(primaryPointer);
} else {
handlePrimaryPointer(event);
}

9
packages/flutter/lib/src/gestures/tap.dart
View File

@ -43,6 +43,15 @@ class TapGestureRecognizer extends PrimaryPointerGestureRecognizer {
}
}
void resolve(GestureDisposition disposition) {
if (_wonArena && disposition == GestureDisposition.rejected) {
if (onTapCancel != null)
onTapCancel();
_reset();
}
super.resolve(disposition);
}
void didExceedDeadline() {
_checkDown();
}

9
packages/unit/test/gestures/tap_test.dart
View File

@ -161,19 +161,28 @@ void main() {
tap.onTap = () {
tapRecognized = true;
};
bool tapCanceled = false;
tap.onTapCancel = () {
tapCanceled = true;
};
tap.addPointer(down3);
GestureArena.instance.close(3);
expect(tapRecognized, isFalse);
expect(tapCanceled, isFalse);
router.route(down3);
expect(tapRecognized, isFalse);
expect(tapCanceled, isFalse);
router.route(move3);
expect(tapRecognized, isFalse);
expect(tapCanceled, isTrue);
router.route(up3);
expect(tapRecognized, isFalse);
expect(tapCanceled, isTrue);
GestureArena.instance.sweep(3);
expect(tapRecognized, isFalse);
expect(tapCanceled, isTrue);
tap.dispose();
});