Commit 144fe36e authored by Hixie's avatar Hixie

RenderConstrainedBox was ignoring its additional constraints for its intrinsic...

RenderConstrainedBox was ignoring its additional constraints for its intrinsic size logic when it had no child.
parent 5aeff1ac
...@@ -558,25 +558,25 @@ class RenderConstrainedBox extends RenderProxyBox { ...@@ -558,25 +558,25 @@ class RenderConstrainedBox extends RenderProxyBox {
double getMinIntrinsicWidth(BoxConstraints constraints) { double getMinIntrinsicWidth(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMinIntrinsicWidth(_additionalConstraints.apply(constraints)); return child.getMinIntrinsicWidth(_additionalConstraints.apply(constraints));
return constraints.constrainWidth(0.0); return _additionalConstraints.apply(constraints).constrainWidth(0.0);
} }
double getMaxIntrinsicWidth(BoxConstraints constraints) { double getMaxIntrinsicWidth(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMaxIntrinsicWidth(_additionalConstraints.apply(constraints)); return child.getMaxIntrinsicWidth(_additionalConstraints.apply(constraints));
return constraints.constrainWidth(0.0); return _additionalConstraints.apply(constraints).constrainWidth(0.0);
} }
double getMinIntrinsicHeight(BoxConstraints constraints) { double getMinIntrinsicHeight(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMinIntrinsicHeight(_additionalConstraints.apply(constraints)); return child.getMinIntrinsicHeight(_additionalConstraints.apply(constraints));
return constraints.constrainHeight(0.0); return _additionalConstraints.apply(constraints).constrainHeight(0.0);
} }
double getMaxIntrinsicHeight(BoxConstraints constraints) { double getMaxIntrinsicHeight(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMaxIntrinsicHeight(_additionalConstraints.apply(constraints)); return child.getMaxIntrinsicHeight(_additionalConstraints.apply(constraints));
return constraints.constrainHeight(0.0); return _additionalConstraints.apply(constraints).constrainHeight(0.0);
} }
void performLayout() { void performLayout() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment