firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2465 from Hixie/cleanup

Browse Source 
Cleanup around viewports
This commit is contained in:
Ian Hickson 2016-03-07 12:02:14 -08:00
commit f07f43b9db
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/flutter/lib/src/rendering/viewport.dart
View File

@ -195,6 +195,14 @@ class RenderViewportBase extends RenderBox implements HasScrollDirection {
super.applyPaintTransform(child, transform.translate(effectivePaintOffset.dx, effectivePaintOffset.dy)); super.applyPaintTransform(child, transform.translate(effectivePaintOffset.dx, effectivePaintOffset.dy));
} }
void debugFillDescription(List<String> description) {
super.debugFillDescription(description);
description.add('paintOffset: $paintOffset');
description.add('scrollDirection: $scrollDirection');
description.add('scrollAnchor: $scrollAnchor');
if (overlayPainter != null)
description.add('overlay painter: $overlayPainter');
}
} }
typedef Offset ViewportDimensionsChangeCallback(ViewportDimensions dimensions); typedef Offset ViewportDimensionsChangeCallback(ViewportDimensions dimensions);
@ -373,4 +381,9 @@ abstract class RenderVirtualViewport<T extends ContainerBoxParentDataMixin<Rende
} }
Rect describeApproximatePaintClip(RenderObject child) => Point.origin & size; Rect describeApproximatePaintClip(RenderObject child) => Point.origin & size;
void debugFillDescription(List<String> description) {
super.debugFillDescription(description);
description.add('virtual child count: $virtualChildCount');
}
} }

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

@ -71,6 +71,7 @@ abstract class ExtentScrollBehavior extends ScrollBehavior<double, double> {
double containerExtent, double containerExtent,
double scrollOffset: 0.0 double scrollOffset: 0.0
}) { }) {
assert(minScrollOffset <= maxScrollOffset);
if (contentExtent != null) if (contentExtent != null)
_contentExtent = contentExtent; _contentExtent = contentExtent;
if (containerExtent != null) if (containerExtent != null)
@ -109,8 +110,10 @@ class BoundedBehavior extends ExtentScrollBehavior {
double minScrollOffset, double minScrollOffset,
double scrollOffset: 0.0 double scrollOffset: 0.0
}) { }) {
if (minScrollOffset != null) if (minScrollOffset != null) {
_minScrollOffset = minScrollOffset; _minScrollOffset = minScrollOffset;
assert(minScrollOffset <= maxScrollOffset);
}
return super.updateExtents( return super.updateExtents(
contentExtent: contentExtent, contentExtent: contentExtent,
containerExtent: containerExtent, containerExtent: containerExtent,