Skip to content

F
Front-End
Unverified Commit 01d0c535 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub
Browse files
Options

partial revert of gesture config (#88534) 

Co-authored-by: 's avatarZachary Anderson <zanderso@users.noreply.github.com>
parent 17114231
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
packages/flutter/lib/src/widgets/scrollable.dart
View file @ 01d0c535
...@@ -15,7 +15,6 @@ import 'basic.dart'; ...@@ -15,7 +15,6 @@ import 'basic.dart';
import 'focus_manager.dart'; import 'focus_manager.dart';
import 'framework.dart'; import 'framework.dart';
import 'gesture_detector.dart'; import 'gesture_detector.dart';
import 'media_query.dart';
import 'notification_listener.dart'; import 'notification_listener.dart';
import 'primary_scroll_controller.dart'; import 'primary_scroll_controller.dart';
import 'restoration.dart'; import 'restoration.dart';
...@@ -400,7 +399,6 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -400,7 +399,6 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
late ScrollBehavior _configuration; late ScrollBehavior _configuration;
ScrollPhysics? _physics; ScrollPhysics? _physics;
ScrollController? _fallbackScrollController; ScrollController? _fallbackScrollController;
MediaQueryData? _mediaQueryData;
ScrollController get _effectiveScrollController => widget.controller ?? _fallbackScrollController!; ScrollController get _effectiveScrollController => widget.controller ?? _fallbackScrollController!;
...@@ -454,7 +452,6 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -454,7 +452,6 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
@override @override
void didChangeDependencies() { void didChangeDependencies() {
_mediaQueryData = MediaQuery.maybeOf(context);
_updatePosition(); _updatePosition();
super.didChangeDependencies(); super.didChangeDependencies();
} }
...@@ -569,8 +566,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -569,8 +566,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
..minFlingVelocity = _physics?.minFlingVelocity ..minFlingVelocity = _physics?.minFlingVelocity
..maxFlingVelocity = _physics?.maxFlingVelocity ..maxFlingVelocity = _physics?.maxFlingVelocity
..velocityTrackerBuilder = _configuration.velocityTrackerBuilder(context) ..velocityTrackerBuilder = _configuration.velocityTrackerBuilder(context)
..dragStartBehavior = widget.dragStartBehavior ..dragStartBehavior = widget.dragStartBehavior;
..gestureSettings = _mediaQueryData?.gestureSettings;
}, },
), ),
}; };
...@@ -590,8 +586,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R ...@@ -590,8 +586,7 @@ class ScrollableState extends State<Scrollable> with TickerProviderStateMixin, R
..minFlingVelocity = _physics?.minFlingVelocity ..minFlingVelocity = _physics?.minFlingVelocity
..maxFlingVelocity = _physics?.maxFlingVelocity ..maxFlingVelocity = _physics?.maxFlingVelocity
..velocityTrackerBuilder = _configuration.velocityTrackerBuilder(context) ..velocityTrackerBuilder = _configuration.velocityTrackerBuilder(context)
..dragStartBehavior = widget.dragStartBehavior ..dragStartBehavior = widget.dragStartBehavior;
..gestureSettings = _mediaQueryData?.gestureSettings;
}, },
), ),
}; };
......
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

HIAST - GitLab