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

Revert "Fix wrap compute max intrinsic width/height with spacing (#82t609)" (#82872)

Browse Source 
This reverts commit 468471bfc1ce61e9ab0120e1dfc6bc7b384b7448.
This commit is contained in:
chunhtai 2021-05-18 21:58:16 -07:00 committed by GitHub
parent 666675078c
commit 15b8722664
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,7 +421,7 @@ class RenderWrap extends RenderBox
double computeMaxIntrinsicWidth(double height) {
switch (direction) {
case Axis.horizontal:
double width = math.max(childCount - 1, 0) * spacing;
double width = 0.0;
RenderBox? child = firstChild;
while (child != null) {
width += child.getMaxIntrinsicWidth(double.infinity);
@ -455,7 +455,7 @@ class RenderWrap extends RenderBox
case Axis.horizontal:
return computeDryLayout(BoxConstraints(maxWidth: width)).height;
case Axis.vertical:
double height = math.max(childCount - 1, 0) * spacing;
double height = 0.0;
RenderBox? child = firstChild;
while (child != null) {
height += child.getMaxIntrinsicHeight(double.infinity);

89
packages/flutter/test/rendering/wrap_test.dart
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:math' as math;
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart';
@ -221,91 +219,4 @@ void main() {
expect(context.clipBehavior, equals(clip));
}
});
test('Compute max intrinsic height with spacing', () {
const double itemWidth = 64;
const double itemHeight = 32;
final RenderBox child = RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
);
final RenderWrap renderWrap = RenderWrap();
renderWrap.add(child);
renderWrap.spacing = 5;
renderWrap.direction = Axis.vertical;
expect(renderWrap.computeMaxIntrinsicHeight(double.infinity), itemHeight);
final List<RenderBox> children = <RenderBox>[
RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
),
RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
),
];
children.forEach(renderWrap.add);
final double childrenHeight = renderWrap.childCount * itemHeight;
final double spacingHeight = math.max(renderWrap.childCount - 1, 0) * renderWrap.spacing;
expect(renderWrap.computeMaxIntrinsicHeight(double.infinity), childrenHeight + spacingHeight);
});
test('Compute max intrinsic width with spacing', () {
const double itemWidth = 64;
const double itemHeight = 32;
final RenderBox child = RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
);
final RenderWrap renderWrap = RenderWrap();
renderWrap.add(child);
renderWrap.spacing = 5;
renderWrap.direction = Axis.horizontal;
expect(renderWrap.computeMaxIntrinsicWidth(double.infinity), itemWidth);
final List<RenderBox> children = <RenderBox>[
RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
),
RenderConstrainedBox(
additionalConstraints: const BoxConstraints.tightFor(
width: itemWidth,
height: itemHeight,
),
),
];
children.forEach(renderWrap.add);
final double childrenWidth = renderWrap.childCount * itemWidth;
final double spacingWidth = math.max(renderWrap.childCount - 1, 0) * renderWrap.spacing;
expect(renderWrap.computeMaxIntrinsicWidth(double.infinity), childrenWidth + spacingWidth);
});
}