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

Side by Side Diff: sky/sdk/lib/widgets/variable_height_scrollable.dart

Issue 1241733002: Correct bottom overscroll in VariableHeightScrollable (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Merge Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « sky/sdk/lib/widgets/scrollable.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 import 'dart:collection'; 5 import 'dart:collection';
6 6
7 import 'package:sky/animation/scroll_behavior.dart'; 7 import 'package:sky/animation/scroll_behavior.dart';
8 import 'package:sky/widgets/basic.dart'; 8 import 'package:sky/widgets/basic.dart';
9 import 'package:sky/widgets/block_viewport.dart'; 9 import 'package:sky/widgets/block_viewport.dart';
10 import 'package:sky/widgets/scrollable.dart'; 10 import 'package:sky/widgets/scrollable.dart';
11 import 'package:sky/widgets/widget.dart'; 11 import 'package:sky/widgets/widget.dart';
12 12
13 class VariableHeightScrollable extends Scrollable { 13 class VariableHeightScrollable extends Scrollable {
14 VariableHeightScrollable({ 14 VariableHeightScrollable({
15 String key, 15 String key,
16 this.builder, 16 this.builder,
17 this.token 17 this.token
18 }) : super(key: key); 18 }) : super(key: key);
19 19
20 IndexedBuilder builder; 20 IndexedBuilder builder;
21 Object token; 21 Object token;
22 bool _contentsChanged = true;
22 23
23 void syncFields(VariableHeightScrollable source) { 24 void syncFields(VariableHeightScrollable source) {
24 builder = source.builder; 25 builder = source.builder;
26 if (token != source.token)
27 _contentsChanged = true;
25 token = source.token; 28 token = source.token;
26 super.syncFields(source); 29 super.syncFields(source);
27 } 30 }
28 31
29 ScrollBehavior createScrollBehavior() => new OverscrollBehavior(); 32 ScrollBehavior createScrollBehavior() => new OverscrollBehavior();
30 OverscrollBehavior get scrollBehavior => super.scrollBehavior; 33 OverscrollBehavior get scrollBehavior => super.scrollBehavior;
31 34
32 void _handleSizeChanged(Size newSize) { 35 void _handleSizeChanged(Size newSize) {
33 scrollBehavior.containerSize = newSize.height; 36 scrollBehavior.containerSize = newSize.height;
34 } 37 }
35 38
36 void _handleLayoutChanged( 39 void _handleLayoutChanged(
37 int firstVisibleChildIndex, 40 int firstVisibleChildIndex,
38 int visibleChildCount, 41 int visibleChildCount,
39 UnmodifiableListView<double> childOffsets, 42 UnmodifiableListView<double> childOffsets,
40 bool didReachLastChild 43 bool didReachLastChild
41 ) { 44 ) {
42 assert(childOffsets.length > 0); 45 assert(childOffsets.length > 0);
43 scrollBehavior.contentsSize = didReachLastChild ? childOffsets.last : double .INFINITY; 46 if (didReachLastChild) {
44 if (didReachLastChild && scrollOffset > scrollBehavior.maxScrollOffset) 47 scrollBehavior.contentsSize = childOffsets.last;
45 settleScrollOffset(); 48 if (_contentsChanged && scrollOffset > scrollBehavior.maxScrollOffset) {
49 _contentsChanged = false;
50 settleScrollOffset();
51 }
52 } else {
53 scrollBehavior.contentsSize = double.INFINITY;
54 }
46 } 55 }
47 56
48 Widget buildContent() { 57 Widget buildContent() {
49 return new SizeObserver( 58 return new SizeObserver(
50 callback: _handleSizeChanged, 59 callback: _handleSizeChanged,
51 child: new BlockViewport( 60 child: new BlockViewport(
52 builder: builder, 61 builder: builder,
53 onLayoutChanged: _handleLayoutChanged, 62 onLayoutChanged: _handleLayoutChanged,
54 startOffset: scrollOffset, 63 startOffset: scrollOffset,
55 token: token 64 token: token
56 ) 65 )
57 ); 66 );
58 } 67 }
59 } 68 }
OLDNEW
« no previous file with comments | « sky/sdk/lib/widgets/scrollable.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698