From 79c3905eb6da867ddc4ce1d6f8c95ab225e22198 Mon Sep 17 00:00:00 2001 From: Hixie Date: Mon, 7 Mar 2016 10:26:24 -0800 Subject: [PATCH] Cleanup around viewports --- packages/flutter/lib/src/rendering/viewport.dart | 13 +++++++++++++ .../flutter/lib/src/widgets/scroll_behavior.dart | 5 ++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/flutter/lib/src/rendering/viewport.dart b/packages/flutter/lib/src/rendering/viewport.dart index f6c0245266..0ecfa83211 100644 --- a/packages/flutter/lib/src/rendering/viewport.dart +++ b/packages/flutter/lib/src/rendering/viewport.dart @@ -195,6 +195,14 @@ class RenderViewportBase extends RenderBox implements HasScrollDirection { super.applyPaintTransform(child, transform.translate(effectivePaintOffset.dx, effectivePaintOffset.dy)); } + void debugFillDescription(List 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); @@ -373,4 +381,9 @@ abstract class RenderVirtualViewport Point.origin & size; + + void debugFillDescription(List description) { + super.debugFillDescription(description); + description.add('virtual child count: $virtualChildCount'); + } } diff --git a/packages/flutter/lib/src/widgets/scroll_behavior.dart b/packages/flutter/lib/src/widgets/scroll_behavior.dart index 7a599dd33c..1d108a2e55 100644 --- a/packages/flutter/lib/src/widgets/scroll_behavior.dart +++ b/packages/flutter/lib/src/widgets/scroll_behavior.dart @@ -71,6 +71,7 @@ abstract class ExtentScrollBehavior extends ScrollBehavior { double containerExtent, double scrollOffset: 0.0 }) { + assert(minScrollOffset <= maxScrollOffset); if (contentExtent != null) _contentExtent = contentExtent; if (containerExtent != null) @@ -109,8 +110,10 @@ class BoundedBehavior extends ExtentScrollBehavior { double minScrollOffset, double scrollOffset: 0.0 }) { - if (minScrollOffset != null) + if (minScrollOffset != null) { _minScrollOffset = minScrollOffset; + assert(minScrollOffset <= maxScrollOffset); + } return super.updateExtents( contentExtent: contentExtent, containerExtent: containerExtent,