Constrain _RenderScaledInlineWidget child size in computeDryLayout (#…

…131765)
engine-flutter-autoroll · Aug 7, 2023 · 55044a6 · 55044a6
1 parent 7de053b
commit 55044a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/flutter/lib/src/widgets/widget_span.dart b/packages/flutter/lib/src/widgets/widget_span.dart
@@ -385,7 +385,7 @@ class _RenderScaledInlineWidget extends RenderBox with RenderObjectWithChildMixi
  Size computeDryLayout(BoxConstraints constraints) {
  assert(!constraints.hasBoundedHeight);
  final Size unscaledSize = child?.computeDryLayout(BoxConstraints(maxWidth: constraints.maxWidth / scale)) ?? Size.zero;
- return unscaledSize * scale;
+ return constraints.constrain(unscaledSize * scale);
  }
 
  @override

diff --git a/packages/flutter/test/widgets/text_test.dart b/packages/flutter/test/widgets/text_test.dart
@@ -273,8 +273,8 @@ void main() {
  textDirection: TextDirection.ltr,
  child: Center(
  child: SizedBox(
- width: 100.3,
- child: Text.rich(WidgetSpan(child: Row()), textScaleFactor: 0.3),
+ width: 502.5454545454545,
+ child: Text.rich(WidgetSpan(child: Row()), textScaleFactor: 0.95),
  ),
  ),
  ),