mirror of
https://github.com/flutter/flutter
synced 2024-10-14 04:02:56 +00:00
This reverts commit 72619b8642
.
This commit is contained in:
parent
a51dc3d913
commit
473744df2c
|
@ -409,8 +409,7 @@ class RenderWrap extends RenderBox
|
|||
int childCount = 0;
|
||||
RenderBox child = firstChild;
|
||||
while (child != null) {
|
||||
// We want to make sure its width can only grow as big as the input width.
|
||||
final double childWidth = math.min(child.getMaxIntrinsicWidth(double.infinity), width);
|
||||
final double childWidth = child.getMaxIntrinsicWidth(double.infinity);
|
||||
final double childHeight = child.getMaxIntrinsicHeight(childWidth);
|
||||
// There must be at least one child before we move on to the next run.
|
||||
if (childCount > 0 && runWidth + childWidth + spacing > width) {
|
||||
|
@ -438,8 +437,7 @@ class RenderWrap extends RenderBox
|
|||
int childCount = 0;
|
||||
RenderBox child = firstChild;
|
||||
while (child != null) {
|
||||
// We want to make sure its height can only grow as big as the input height.
|
||||
final double childHeight = math.min(child.getMaxIntrinsicHeight(double.infinity), height);
|
||||
final double childHeight = child.getMaxIntrinsicHeight(double.infinity);
|
||||
final double childWidth = child.getMaxIntrinsicWidth(childHeight);
|
||||
// There must be at least one child before we move on to the next run.
|
||||
if (childCount > 0 && runHeight + childHeight + spacing > height) {
|
||||
|
|
|
@ -70,54 +70,6 @@ void main() {
|
|||
expect(renderWrap.computeMinIntrinsicHeight(79), 250);
|
||||
});
|
||||
|
||||
test('Compute intrinsic height test for width-in-height-out children', () {
|
||||
const double lineHeight = 15.0;
|
||||
final RenderWrap renderWrap = RenderWrap();
|
||||
renderWrap.add(
|
||||
RenderParagraph(
|
||||
const TextSpan(
|
||||
text: 'A very very very very very very very very long text',
|
||||
style: TextStyle(fontSize: lineHeight),
|
||||
),
|
||||
textDirection: TextDirection.ltr,
|
||||
),
|
||||
);
|
||||
|
||||
renderWrap.spacing = 0;
|
||||
renderWrap.runSpacing = 0;
|
||||
renderWrap.direction = Axis.horizontal;
|
||||
|
||||
expect(renderWrap.computeMaxIntrinsicHeight(double.infinity), lineHeight);
|
||||
expect(renderWrap.computeMaxIntrinsicHeight(600), 2 * lineHeight);
|
||||
expect(renderWrap.computeMaxIntrinsicHeight(300), 3 * lineHeight);
|
||||
});
|
||||
|
||||
test('Compute intrinsic width test for height-in-width-out children', () {
|
||||
const double lineHeight = 15.0;
|
||||
final RenderWrap renderWrap = RenderWrap();
|
||||
renderWrap.add(
|
||||
// Rotates a width-in-height-out render object to make it height-in-width-out.
|
||||
RenderRotatedBox(
|
||||
quarterTurns: 1,
|
||||
child: RenderParagraph(
|
||||
const TextSpan(
|
||||
text: 'A very very very very very very very very long text',
|
||||
style: TextStyle(fontSize: lineHeight),
|
||||
),
|
||||
textDirection: TextDirection.ltr,
|
||||
)
|
||||
),
|
||||
);
|
||||
|
||||
renderWrap.spacing = 0;
|
||||
renderWrap.runSpacing = 0;
|
||||
renderWrap.direction = Axis.vertical;
|
||||
|
||||
expect(renderWrap.computeMaxIntrinsicWidth(double.infinity), lineHeight);
|
||||
expect(renderWrap.computeMaxIntrinsicWidth(600), 2 * lineHeight);
|
||||
expect(renderWrap.computeMaxIntrinsicWidth(300), 3 * lineHeight);
|
||||
});
|
||||
|
||||
test('Compute intrinsic width test', () {
|
||||
final List<RenderBox> children = <RenderBox>[
|
||||
RenderConstrainedBox(
|
||||
|
|
Loading…
Reference in a new issue