From 144fe36e25a7057a6da235bf2e7cb449f89ac7ef Mon Sep 17 00:00:00 2001 From: Hixie Date: Thu, 23 Jul 2015 09:05:57 -0700 Subject: [PATCH] RenderConstrainedBox was ignoring its additional constraints for its intrinsic size logic when it had no child. --- packages/flutter/lib/rendering/box.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flutter/lib/rendering/box.dart b/packages/flutter/lib/rendering/box.dart index eafd40d1e15..efe1cd984dc 100644 --- a/packages/flutter/lib/rendering/box.dart +++ b/packages/flutter/lib/rendering/box.dart @@ -558,25 +558,25 @@ class RenderConstrainedBox extends RenderProxyBox { double getMinIntrinsicWidth(BoxConstraints constraints) { if (child != null) return child.getMinIntrinsicWidth(_additionalConstraints.apply(constraints)); - return constraints.constrainWidth(0.0); + return _additionalConstraints.apply(constraints).constrainWidth(0.0); } double getMaxIntrinsicWidth(BoxConstraints constraints) { if (child != null) return child.getMaxIntrinsicWidth(_additionalConstraints.apply(constraints)); - return constraints.constrainWidth(0.0); + return _additionalConstraints.apply(constraints).constrainWidth(0.0); } double getMinIntrinsicHeight(BoxConstraints constraints) { if (child != null) return child.getMinIntrinsicHeight(_additionalConstraints.apply(constraints)); - return constraints.constrainHeight(0.0); + return _additionalConstraints.apply(constraints).constrainHeight(0.0); } double getMaxIntrinsicHeight(BoxConstraints constraints) { if (child != null) return child.getMaxIntrinsicHeight(_additionalConstraints.apply(constraints)); - return constraints.constrainHeight(0.0); + return _additionalConstraints.apply(constraints).constrainHeight(0.0); } void performLayout() {