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

Revert "Constrain width/hight when asking child for intrinsics (#71880)" (#72102)

Browse Source 
This reverts commit ceca634e9800dc50c7680ecb346f8a4e442de5c5.
This commit is contained in:
Michael Goderbauer 2020-12-10 17:03:56 -08:00 committed by GitHub
parent d447141bac
commit 8df56056b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -234,7 +234,7 @@ class RenderConstrainedBox extends RenderProxyBox {
double computeMinIntrinsicWidth(double height) { double computeMinIntrinsicWidth(double height) {
if (_additionalConstraints.hasBoundedWidth && _additionalConstraints.hasTightWidth) if (_additionalConstraints.hasBoundedWidth && _additionalConstraints.hasTightWidth)
return _additionalConstraints.minWidth; return _additionalConstraints.minWidth;
final double width = super.computeMinIntrinsicWidth(_additionalConstraints.constrainHeight(height)); final double width = super.computeMinIntrinsicWidth(height);
assert(width.isFinite); assert(width.isFinite);
if (!_additionalConstraints.hasInfiniteWidth) if (!_additionalConstraints.hasInfiniteWidth)
return _additionalConstraints.constrainWidth(width); return _additionalConstraints.constrainWidth(width);
@ -245,7 +245,7 @@ class RenderConstrainedBox extends RenderProxyBox {
double computeMaxIntrinsicWidth(double height) { double computeMaxIntrinsicWidth(double height) {
if (_additionalConstraints.hasBoundedWidth && _additionalConstraints.hasTightWidth) if (_additionalConstraints.hasBoundedWidth && _additionalConstraints.hasTightWidth)
return _additionalConstraints.minWidth; return _additionalConstraints.minWidth;
final double width = super.computeMaxIntrinsicWidth(_additionalConstraints.constrainHeight(height)); final double width = super.computeMaxIntrinsicWidth(height);
assert(width.isFinite); assert(width.isFinite);
if (!_additionalConstraints.hasInfiniteWidth) if (!_additionalConstraints.hasInfiniteWidth)
return _additionalConstraints.constrainWidth(width); return _additionalConstraints.constrainWidth(width);
@ -256,7 +256,7 @@ class RenderConstrainedBox extends RenderProxyBox {
double computeMinIntrinsicHeight(double width) { double computeMinIntrinsicHeight(double width) {
if (_additionalConstraints.hasBoundedHeight && _additionalConstraints.hasTightHeight) if (_additionalConstraints.hasBoundedHeight && _additionalConstraints.hasTightHeight)
return _additionalConstraints.minHeight; return _additionalConstraints.minHeight;
final double height = super.computeMinIntrinsicHeight(_additionalConstraints.constrainWidth(width)); final double height = super.computeMinIntrinsicHeight(width);
assert(height.isFinite); assert(height.isFinite);
if (!_additionalConstraints.hasInfiniteHeight) if (!_additionalConstraints.hasInfiniteHeight)
return _additionalConstraints.constrainHeight(height); return _additionalConstraints.constrainHeight(height);
@ -267,7 +267,7 @@ class RenderConstrainedBox extends RenderProxyBox {
double computeMaxIntrinsicHeight(double width) { double computeMaxIntrinsicHeight(double width) {
if (_additionalConstraints.hasBoundedHeight && _additionalConstraints.hasTightHeight) if (_additionalConstraints.hasBoundedHeight && _additionalConstraints.hasTightHeight)
return _additionalConstraints.minHeight; return _additionalConstraints.minHeight;
final double height = super.computeMaxIntrinsicHeight(_additionalConstraints.constrainWidth(width)); final double height = super.computeMaxIntrinsicHeight(width);
assert(height.isFinite); assert(height.isFinite);
if (!_additionalConstraints.hasInfiniteHeight) if (!_additionalConstraints.hasInfiniteHeight)
return _additionalConstraints.constrainHeight(height); return _additionalConstraints.constrainHeight(height);

19
packages/flutter/test/widgets/sized_box_test.dart
View File

@ -190,23 +190,4 @@ void main() {
); );
expect(patient.currentContext!.size, equals(const Size(0.0, 0.0))); expect(patient.currentContext!.size, equals(const Size(0.0, 0.0)));
}); });
testWidgets('SizedBox constrains intrinsics', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/27293.
await tester.pumpWidget(
const Directionality(
textDirection: TextDirection.ltr,
child: Center(
child: IntrinsicHeight(
child: SizedBox(
width: 100,
child: Text('This is a multi-line text.', style: TextStyle(height: 1.0, fontSize: 16)),
),
),
),
),
);
expect(tester.getSize(find.text('This is a multi-line text.')).height, greaterThan(16));
});
} }