github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rename fixit] createFlingScrollSimulation -> createScrollSimulation

Browse Source 
Fixes #2233
This commit is contained in:
Adam Barth 2016-03-12 11:51:44 -08:00
parent 726eff4953
commit 892063ac69
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/tabs.dart
View File

@ -374,7 +374,7 @@ class _TabsScrollBehavior extends BoundedBehavior {
bool isScrollable = true; bool isScrollable = true;
Simulation createFlingScrollSimulation(double position, double velocity) { Simulation createScrollSimulation(double position, double velocity) {
if (!isScrollable) if (!isScrollable)
return null; return null;

14
packages/flutter/lib/src/widgets/scroll_behavior.dart
View File

@ -19,7 +19,7 @@ abstract class ScrollBehavior<T, U> {
/// This function is called when a drag gesture ends. /// This function is called when a drag gesture ends.
/// ///
/// Returns null if the behavior is to do nothing. /// Returns null if the behavior is to do nothing.
Simulation createFlingScrollSimulation(T position, U velocity) => null; Simulation createScrollSimulation(T position, U velocity) => null;
/// Returns an animation that ends at the snap offset. /// Returns an animation that ends at the snap offset.
/// ///
@ -129,7 +129,7 @@ class BoundedBehavior extends ExtentScrollBehavior {
} }
} }
Simulation _createFlingScrollSimulation(double position, double velocity, double minScrollOffset, double maxScrollOffset) { Simulation _createScrollSimulation(double position, double velocity, double minScrollOffset, double maxScrollOffset) {
final double startVelocity = velocity * _kSecondsPerMillisecond; final double startVelocity = velocity * _kSecondsPerMillisecond;
final SpringDescription spring = new SpringDescription.withDampingRatio(mass: 1.0, springConstant: 170.0, ratio: 1.1); final SpringDescription spring = new SpringDescription.withDampingRatio(mass: 1.0, springConstant: 170.0, ratio: 1.1);
return new ScrollSimulation(position, startVelocity, minScrollOffset, maxScrollOffset, spring, _kScrollDrag); return new ScrollSimulation(position, startVelocity, minScrollOffset, maxScrollOffset, spring, _kScrollDrag);
@ -145,7 +145,7 @@ class UnboundedBehavior extends ExtentScrollBehavior {
UnboundedBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 }) UnboundedBehavior({ double contentExtent: 0.0, double containerExtent: 0.0 })
: super(contentExtent: contentExtent, containerExtent: containerExtent); : super(contentExtent: contentExtent, containerExtent: containerExtent);
Simulation createFlingScrollSimulation(double position, double velocity) { Simulation createScrollSimulation(double position, double velocity) {
double velocityPerSecond = velocity * 1000.0; double velocityPerSecond = velocity * 1000.0;
return new BoundedFrictionSimulation( return new BoundedFrictionSimulation(
_kScrollDrag, position, velocityPerSecond, double.NEGATIVE_INFINITY, double.INFINITY _kScrollDrag, position, velocityPerSecond, double.NEGATIVE_INFINITY, double.INFINITY
@ -169,8 +169,8 @@ class OverscrollBehavior extends BoundedBehavior {
OverscrollBehavior({ double contentExtent: 0.0, double containerExtent: 0.0, double minScrollOffset: 0.0 }) OverscrollBehavior({ double contentExtent: 0.0, double containerExtent: 0.0, double minScrollOffset: 0.0 })
: super(contentExtent: contentExtent, containerExtent: containerExtent, minScrollOffset: minScrollOffset); : super(contentExtent: contentExtent, containerExtent: containerExtent, minScrollOffset: minScrollOffset);
Simulation createFlingScrollSimulation(double position, double velocity) { Simulation createScrollSimulation(double position, double velocity) {
return _createFlingScrollSimulation(position, velocity, minScrollOffset, maxScrollOffset); return _createScrollSimulation(position, velocity, minScrollOffset, maxScrollOffset);
} }
Simulation createSnapScrollSimulation(double startOffset, double endOffset, double startVelocity, double endVelocity) { Simulation createSnapScrollSimulation(double startOffset, double endOffset, double startVelocity, double endVelocity) {
@ -201,9 +201,9 @@ class OverscrollWhenScrollableBehavior extends OverscrollBehavior {
bool get isScrollable => contentExtent > containerExtent; bool get isScrollable => contentExtent > containerExtent;
Simulation createFlingScrollSimulation(double position, double velocity) { Simulation createScrollSimulation(double position, double velocity) {
if (isScrollable || position < minScrollOffset || position > maxScrollOffset) if (isScrollable || position < minScrollOffset || position > maxScrollOffset)
return super.createFlingScrollSimulation(position, velocity); return super.createScrollSimulation(position, velocity);
return null; return null;
} }

2
packages/flutter/lib/src/widgets/scrollable.dart
View File

@ -439,7 +439,7 @@ abstract class ScrollableState<T extends Scrollable> extends State<T> {
} }
Simulation _createFlingSimulation(double scrollVelocity) { Simulation _createFlingSimulation(double scrollVelocity) {
final Simulation simulation = scrollBehavior.createFlingScrollSimulation(scrollOffset, scrollVelocity); final Simulation simulation = scrollBehavior.createScrollSimulation(scrollOffset, scrollVelocity);
if (simulation != null) { if (simulation != null) {
final double endVelocity = pixelOffsetToScrollOffset(kPixelScrollTolerance.velocity).abs() * (scrollVelocity < 0.0 ? -1.0 : 1.0); final double endVelocity = pixelOffsetToScrollOffset(kPixelScrollTolerance.velocity).abs() * (scrollVelocity < 0.0 ? -1.0 : 1.0);
final double endDistance = pixelOffsetToScrollOffset(kPixelScrollTolerance.distance).abs(); final double endDistance = pixelOffsetToScrollOffset(kPixelScrollTolerance.distance).abs();