Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: sky/framework/components/scrollable.dart

Issue 999423004: Drive overscroll animations with a physics simulation (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: More comments Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/framework/animation/simulation.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/framework/components/scrollable.dart
diff --git a/sky/framework/components/scrollable.dart b/sky/framework/components/scrollable.dart
index 838dbe9c818d25c568c2632d29f3d281ddf53fe0..e831ad5317b498ad3fb5cd9cb0f8eeeb89e5de1b 100644
--- a/sky/framework/components/scrollable.dart
+++ b/sky/framework/components/scrollable.dart
@@ -6,6 +6,8 @@ import '../animation/curves.dart';
import '../animation/fling_curve.dart';
import '../animation/generator.dart';
import '../animation/scroll_curve.dart';
+import '../animation/kinematics.dart';
+import '../animation/simulation.dart';
import '../fn.dart';
import 'dart:sky' as sky;
@@ -16,7 +18,7 @@ abstract class Scrollable extends Component {
double _scrollOffset = 0.0;
FlingCurve _flingCurve;
int _flingAnimationId;
- AnimationGenerator _scrollAnimation;
+ Simulation _simulation;
Scrollable({Object key, this.scrollCurve}) : super(key: key) {
events.listen('pointerdown', _handlePointerDown);
@@ -31,7 +33,7 @@ abstract class Scrollable extends Component {
void didUnmount() {
super.didUnmount();
_stopFling();
- _stopScrollAnimation();
+ _stopSimulation();
}
bool scrollBy(double scrollDelta) {
@@ -44,25 +46,6 @@ abstract class Scrollable extends Component {
return true;
}
- void animateScrollTo(double targetScrollOffset, {
- double initialDelay: 0.0,
- double duration: 0.0,
- Curve curve: linear}) {
- _stopScrollAnimation();
- _scrollAnimation = new AnimationGenerator(
- duration: duration,
- begin: _scrollOffset,
- end: targetScrollOffset,
- initialDelay: initialDelay,
- curve: curve);
- _scrollAnimation.onTick.listen((newScrollOffset) {
- if (!scrollBy(newScrollOffset - _scrollOffset))
- _stopScrollAnimation();
- }, onDone: () {
- _scrollAnimation = null;
- });
- }
-
void _scheduleFlingUpdate() {
_flingAnimationId = sky.window.requestAnimationFrame(_updateFling);
}
@@ -75,11 +58,11 @@ abstract class Scrollable extends Component {
_flingAnimationId = null;
}
- void _stopScrollAnimation() {
- if (_scrollAnimation == null)
+ void _stopSimulation() {
+ if (_simulation == null)
return;
- _scrollAnimation.cancel();
- _scrollAnimation = null;
+ _simulation.cancel();
+ _simulation = null;
}
void _updateFling(double timeStamp) {
@@ -91,13 +74,20 @@ abstract class Scrollable extends Component {
void _settle() {
_stopFling();
- if (_scrollOffset < 0.0)
- animateScrollTo(0.0, duration: 200.0, curve: easeOut);
+ Particle particle = new Particle(position: scrollOffset);
+ _simulation = scrollCurve.release(particle);
+ if (_simulation == null)
+ return;
+ _simulation.onTick.listen((_) {
+ setState(() {
+ _scrollOffset = particle.position;
+ });
+ });
}
void _handlePointerDown(_) {
_stopFling();
- _stopScrollAnimation();
+ _stopSimulation();
}
void _handlePointerUpOrCancel(_) {
@@ -110,7 +100,7 @@ abstract class Scrollable extends Component {
}
void _handleFlingStart(sky.GestureEvent event) {
- _stopScrollAnimation();
+ _stopSimulation();
_flingCurve = new FlingCurve(-event.velocityY, event.timeStamp);
_scheduleFlingUpdate();
}
« no previous file with comments | « sky/framework/animation/simulation.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698