Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gesture disambiguation fix #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

gesture disambiguation fix #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 16 additions & 48 deletions lib/src/cupertino_page_route.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,40 +627,22 @@ class _CupertinoBackGestureDetector<T> extends StatefulWidget {
class _CupertinoBackGestureDetectorState<T> extends State<_CupertinoBackGestureDetector<T>> {
_CupertinoBackGestureController<T>? _backGestureController;

late HorizontalDragGestureRecognizer _recognizer;

@override
void initState() {
super.initState();
_recognizer = HorizontalDragGestureRecognizer(debugOwner: this)
..onStart = _handleDragStart
..onUpdate = _handleDragUpdate
..onEnd = _handleDragEnd
..onCancel = _handleDragCancel;
}

@override
void dispose() {
_recognizer.dispose();
super.dispose();
}

void _handleDragStart(DragStartDetails details) {
assert(mounted);
assert(_backGestureController == null);
_backGestureController = widget.onStartPopGesture();
}
void _handleDragStart(DragStartDetails details, double dragAreaWidth) {
if (details.localPosition.dx < dragAreaWidth && widget.enabledCallback()) {
assert(mounted);
assert(_backGestureController == null);
_backGestureController = widget.onStartPopGesture();
}
}

void _handleDragUpdate(DragUpdateDetails details) {
assert(mounted);
assert(_backGestureController != null);
_backGestureController!.dragUpdate(_convertToLogical(details.primaryDelta! / context.size!.width));
_backGestureController?.dragUpdate(_convertToLogical(details.primaryDelta! / context.size!.width));
}

void _handleDragEnd(DragEndDetails details) {
assert(mounted);
assert(_backGestureController != null);
_backGestureController!.dragEnd(_convertToLogical(details.velocity.pixelsPerSecond.dx / context.size!.width));
_backGestureController?.dragEnd(_convertToLogical(details.velocity.pixelsPerSecond.dx / context.size!.width));
_backGestureController = null;
}

Expand All @@ -672,11 +654,6 @@ class _CupertinoBackGestureDetectorState<T> extends State<_CupertinoBackGestureD
_backGestureController = null;
}

void _handlePointerDown(PointerDownEvent event) {
if (widget.enabledCallback())
_recognizer.addPointer(event);
}

double _convertToLogical(double value) {
switch (Directionality.of(context)) {
case TextDirection.rtl:
Expand All @@ -701,22 +678,13 @@ class _CupertinoBackGestureDetectorState<T> extends State<_CupertinoBackGestureD
MediaQuery.of(context).padding.left :
MediaQuery.of(context).padding.right;
dragAreaWidth = max(dragAreaWidth, _backGestureWidth);
return Stack(
fit: StackFit.passthrough,
children: <Widget>[
widget.child,
PositionedDirectional(
start: 0.0,
width: dragAreaWidth,
top: 0.0,
bottom: 0.0,
child: Listener(
onPointerDown: _handlePointerDown,
behavior: HitTestBehavior.translucent,
),
),
],
);
return GestureDetector(
onHorizontalDragEnd: _handleDragEnd,
onHorizontalDragStart: (details) => _handleDragStart(details, dragAreaWidth),
onHorizontalDragUpdate: _handleDragUpdate,
onHorizontalDragCancel: _handleDragCancel,
child: widget.child,
);
}
}

Expand Down