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

Merge pull request #2492 from abarth/intrinsics

Browse Source 
Remove bogus intrinsic size assert
This commit is contained in:
Adam Barth 2016-03-08 12:08:34 -08:00
commit eba2d44f3a
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/rendering/block.dart
View File

@ -151,11 +151,6 @@ class RenderBlock extends RenderBlockBase {
double childExtent = isVertical ? double childExtent = isVertical ?
child.getMinIntrinsicHeight(innerConstraints) : child.getMinIntrinsicHeight(innerConstraints) :
child.getMinIntrinsicWidth(innerConstraints); child.getMinIntrinsicWidth(innerConstraints);
assert(() {
if (isVertical)
return childExtent == child.getMaxIntrinsicHeight(innerConstraints);
return childExtent == child.getMaxIntrinsicWidth(innerConstraints);
});
extent += childExtent; extent += childExtent;
final BlockParentData childParentData = child.parentData; final BlockParentData childParentData = child.parentData;
child = childParentData.nextSibling; child = childParentData.nextSibling;

4
packages/flutter/lib/src/rendering/box.dart
View File

@ -419,7 +419,7 @@ abstract class RenderBox extends RenderObject {
} }
/// Returns the smallest width beyond which increasing the width never /// Returns the smallest width beyond which increasing the width never
/// decreases the height. /// decreases the preferred height.
/// ///
/// Override in subclasses that implement [performLayout]. /// Override in subclasses that implement [performLayout].
double getMaxIntrinsicWidth(BoxConstraints constraints) { double getMaxIntrinsicWidth(BoxConstraints constraints) {
@ -437,7 +437,7 @@ abstract class RenderBox extends RenderObject {
} }
/// Returns the smallest height beyond which increasing the height never /// Returns the smallest height beyond which increasing the height never
/// decreases the width. /// decreases the preferred width.
/// ///
/// If the layout algorithm used is width-in-height-out, i.e. the height /// If the layout algorithm used is width-in-height-out, i.e. the height
/// depends on the width and not vice versa, then this will return the same /// depends on the width and not vice versa, then this will return the same

4
packages/flutter/lib/src/rendering/grid.dart
View File

@ -166,7 +166,7 @@ abstract class GridDelegate {
} }
/// Returns the smallest width beyond which increasing the width never /// Returns the smallest width beyond which increasing the width never
/// decreases the height. /// decreases the preferred height.
double getMaxIntrinsicWidth(BoxConstraints constraints, int childCount) { double getMaxIntrinsicWidth(BoxConstraints constraints, int childCount) {
return constraints.constrainWidth(_getGridSize(constraints, childCount).width); return constraints.constrainWidth(_getGridSize(constraints, childCount).width);
} }
@ -178,7 +178,7 @@ abstract class GridDelegate {
} }
/// Returns the smallest height beyond which increasing the height never /// Returns the smallest height beyond which increasing the height never
/// decreases the width. /// decreases the preferred width.
double getMaxIntrinsicHeight(BoxConstraints constraints, int childCount) { double getMaxIntrinsicHeight(BoxConstraints constraints, int childCount) {
return constraints.constrainHeight(_getGridSize(constraints, childCount).height); return constraints.constrainHeight(_getGridSize(constraints, childCount).height);
} }