Commit 1d5f2533 authored by Adam Barth's avatar Adam Barth

Normalize some function names in proxy_box.dart

We call this function _getInnerConstraints in other classes. Also, this change
makes it private for RenderOverflowBox.
parent f79fdff2
...@@ -190,7 +190,7 @@ class RenderFractionallySizedBox extends RenderProxyBox { ...@@ -190,7 +190,7 @@ class RenderFractionallySizedBox extends RenderProxyBox {
markNeedsLayout(); markNeedsLayout();
} }
BoxConstraints _computeChildConstraints(BoxConstraints constraints) { BoxConstraints _getInnerConstraints(BoxConstraints constraints) {
return new BoxConstraints( return new BoxConstraints(
minWidth: _widthFactor == null ? constraints.minWidth : constraints.maxWidth * _widthFactor, minWidth: _widthFactor == null ? constraints.minWidth : constraints.maxWidth * _widthFactor,
maxWidth: _widthFactor == null ? constraints.maxWidth : constraints.maxWidth * _widthFactor, maxWidth: _widthFactor == null ? constraints.maxWidth : constraints.maxWidth * _widthFactor,
...@@ -201,34 +201,34 @@ class RenderFractionallySizedBox extends RenderProxyBox { ...@@ -201,34 +201,34 @@ class RenderFractionallySizedBox extends RenderProxyBox {
double getMinIntrinsicWidth(BoxConstraints constraints) { double getMinIntrinsicWidth(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMinIntrinsicWidth(_computeChildConstraints(constraints)); return child.getMinIntrinsicWidth(_getInnerConstraints(constraints));
return _computeChildConstraints(constraints).constrainWidth(0.0); return _getInnerConstraints(constraints).constrainWidth(0.0);
} }
double getMaxIntrinsicWidth(BoxConstraints constraints) { double getMaxIntrinsicWidth(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMaxIntrinsicWidth(_computeChildConstraints(constraints)); return child.getMaxIntrinsicWidth(_getInnerConstraints(constraints));
return _computeChildConstraints(constraints).constrainWidth(0.0); return _getInnerConstraints(constraints).constrainWidth(0.0);
} }
double getMinIntrinsicHeight(BoxConstraints constraints) { double getMinIntrinsicHeight(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMinIntrinsicHeight(_computeChildConstraints(constraints)); return child.getMinIntrinsicHeight(_getInnerConstraints(constraints));
return _computeChildConstraints(constraints).constrainHeight(0.0); return _getInnerConstraints(constraints).constrainHeight(0.0);
} }
double getMaxIntrinsicHeight(BoxConstraints constraints) { double getMaxIntrinsicHeight(BoxConstraints constraints) {
if (child != null) if (child != null)
return child.getMaxIntrinsicHeight(_computeChildConstraints(constraints)); return child.getMaxIntrinsicHeight(_getInnerConstraints(constraints));
return _computeChildConstraints(constraints).constrainHeight(0.0); return _getInnerConstraints(constraints).constrainHeight(0.0);
} }
void performLayout() { void performLayout() {
if (child != null) { if (child != null) {
child.layout(_computeChildConstraints(constraints), parentUsesSize: true); child.layout(_getInnerConstraints(constraints), parentUsesSize: true);
size = child.size; size = child.size;
} else { } else {
size = _computeChildConstraints(constraints).constrain(Size.zero); size = _getInnerConstraints(constraints).constrain(Size.zero);
} }
} }
...@@ -313,7 +313,7 @@ class RenderOverflowBox extends RenderProxyBox { ...@@ -313,7 +313,7 @@ class RenderOverflowBox extends RenderProxyBox {
markNeedsLayout(); markNeedsLayout();
} }
BoxConstraints childConstraints(BoxConstraints constraints) { BoxConstraints _getInnerConstraints(BoxConstraints constraints) {
return new BoxConstraints( return new BoxConstraints(
minWidth: _minWidth ?? constraints.minWidth, minWidth: _minWidth ?? constraints.minWidth,
maxWidth: _maxWidth ?? constraints.maxWidth, maxWidth: _maxWidth ?? constraints.maxWidth,
...@@ -346,7 +346,7 @@ class RenderOverflowBox extends RenderProxyBox { ...@@ -346,7 +346,7 @@ class RenderOverflowBox extends RenderProxyBox {
void performLayout() { void performLayout() {
if (child != null) if (child != null)
child.layout(childConstraints(constraints)); child.layout(_getInnerConstraints(constraints));
} }
String debugDescribeSettings(String prefix) { String debugDescribeSettings(String prefix) {
......
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