mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
6ff02dbc83
This PR includes the `widthFactor` and `heightFactor` when computing the intrinsic size of a `RenderPositionedBox`.
<details><summary>Code sample</summary>
Red should have a height of 100, blue one of 200.
```dart
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
void main() {
runApp(const MyApp());
}
class MyApp extends StatelessWidget {
const MyApp({super.key});
@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Intrinsic Bug',
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
useMaterial3: true,
),
home: Scaffold(
body: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: IntrinsicHeight(
child: Align(
heightFactor: 0.5,
child: Container(
height: 200,
color: Colors.red,
),
),
),
),
Expanded(
child: Container(
height: 200,
color: Colors.blue,
),
),
],
),
),
);
}
}
```
</details>
Before:
After:
Fix #135822
88 lines
3.7 KiB
Dart
88 lines
3.7 KiB
Dart
// Copyright 2014 The Flutter Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:flutter/rendering.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
import 'rendering_tester.dart';
|
|
|
|
void main() {
|
|
TestRenderingFlutterBinding.ensureInitialized();
|
|
|
|
test('RenderPositionedBox expands', () {
|
|
final RenderConstrainedBox sizer = RenderConstrainedBox(
|
|
additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
|
|
child: RenderDecoratedBox(decoration: const BoxDecoration()),
|
|
);
|
|
final RenderPositionedBox positioner = RenderPositionedBox(child: sizer);
|
|
layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
|
|
|
|
expect(positioner.size.width, equals(200.0), reason: 'positioner width');
|
|
expect(positioner.size.height, equals(200.0), reason: 'positioner height');
|
|
});
|
|
|
|
test('RenderPositionedBox shrink wraps', () {
|
|
final RenderConstrainedBox sizer = RenderConstrainedBox(
|
|
additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
|
|
child: RenderDecoratedBox(decoration: const BoxDecoration()),
|
|
);
|
|
final RenderPositionedBox positioner = RenderPositionedBox(child: sizer, widthFactor: 1.0);
|
|
layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
|
|
|
|
expect(positioner.size.width, equals(100.0), reason: 'positioner width');
|
|
expect(positioner.size.height, equals(200.0), reason: 'positioner height');
|
|
|
|
positioner.widthFactor = null;
|
|
positioner.heightFactor = 1.0;
|
|
pumpFrame();
|
|
|
|
expect(positioner.size.width, equals(200.0), reason: 'positioner width');
|
|
expect(positioner.size.height, equals(100.0), reason: 'positioner height');
|
|
|
|
positioner.widthFactor = 1.0;
|
|
pumpFrame();
|
|
|
|
expect(positioner.size.width, equals(100.0), reason: 'positioner width');
|
|
expect(positioner.size.height, equals(100.0), reason: 'positioner height');
|
|
});
|
|
|
|
test('RenderPositionedBox width and height factors', () {
|
|
final RenderConstrainedBox sizer = RenderConstrainedBox(
|
|
additionalConstraints: BoxConstraints.tight(const Size(100.0, 100.0)),
|
|
child: RenderDecoratedBox(decoration: const BoxDecoration()),
|
|
);
|
|
final RenderPositionedBox positioner = RenderPositionedBox(child: sizer, widthFactor: 1.0, heightFactor: 0.0);
|
|
layout(positioner, constraints: BoxConstraints.loose(const Size(200.0, 200.0)));
|
|
|
|
expect(positioner.computeMinIntrinsicWidth(200), equals(100.0));
|
|
expect(positioner.computeMaxIntrinsicWidth(200), equals(100.0));
|
|
expect(positioner.computeMinIntrinsicHeight(200), equals(0));
|
|
expect(positioner.computeMaxIntrinsicHeight(200), equals(0));
|
|
expect(positioner.size.width, equals(100.0));
|
|
expect(positioner.size.height, equals(0.0));
|
|
|
|
positioner.widthFactor = 0.5;
|
|
positioner.heightFactor = 0.5;
|
|
pumpFrame();
|
|
|
|
expect(positioner.computeMinIntrinsicWidth(200), equals(50.0));
|
|
expect(positioner.computeMaxIntrinsicWidth(200), equals(50.0));
|
|
expect(positioner.computeMinIntrinsicHeight(200), equals(50.0));
|
|
expect(positioner.computeMaxIntrinsicHeight(200), equals(50.0));
|
|
expect(positioner.size.width, equals(50.0));
|
|
expect(positioner.size.height, equals(50.0));
|
|
|
|
positioner.widthFactor = null;
|
|
positioner.heightFactor = null;
|
|
pumpFrame();
|
|
|
|
expect(positioner.computeMinIntrinsicWidth(200), equals(100.0));
|
|
expect(positioner.computeMaxIntrinsicWidth(200), equals(100.0));
|
|
expect(positioner.computeMinIntrinsicHeight(200), equals(100.0));
|
|
expect(positioner.computeMaxIntrinsicHeight(200), equals(100.0));
|
|
expect(positioner.size.width, equals(200.0));
|
|
expect(positioner.size.height, equals(200.0));
|
|
});
|
|
}
|