development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 19:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove bogus intrinsic size assert

Browse source 
This patch tweaks the definition of max intrinsic size to give implementations
more wiggle room to compute there intrinsic sizes more efficiently.
Specifically, implementations can now ignore the incomming constraint in the
cross axis if they prefer.

This patch removes an assert that is no longer valid w.r.t. the new definition
of intrinsic sizing.

Fixes #2099
This commit is contained in:
Adam Barth 2016-03-08 11:14:00 -08:00
parent 0e675be6f9
commit 501b948e05
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 ?
child.getMinIntrinsicHeight(innerConstraints) :
child.getMinIntrinsicWidth(innerConstraints);
assert(() {
if (isVertical)
return childExtent == child.getMaxIntrinsicHeight(innerConstraints);
return childExtent == child.getMaxIntrinsicWidth(innerConstraints);
});
extent += childExtent;
final BlockParentData childParentData = child.parentData;
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
/// decreases the height.
/// decreases the preferred height.
///
/// Override in subclasses that implement [performLayout].
double getMaxIntrinsicWidth(BoxConstraints constraints) {
@ -437,7 +437,7 @@ abstract class RenderBox extends RenderObject {
}
/// 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
/// 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
/// decreases the height.
/// decreases the preferred height.
double getMaxIntrinsicWidth(BoxConstraints constraints, int childCount) {
return constraints.constrainWidth(_getGridSize(constraints, childCount).width);
}
@ -178,7 +178,7 @@ abstract class GridDelegate {
}
/// Returns the smallest height beyond which increasing the height never
/// decreases the width.
/// decreases the preferred width.
double getMaxIntrinsicHeight(BoxConstraints constraints, int childCount) {
return constraints.constrainHeight(_getGridSize(constraints, childCount).height);
}