Unverified Commit a88e2c87 authored by renyou's avatar renyou Committed by GitHub

Revert "fix the widget span layout when text scale factor != 1 (#59711)" (#59986)

This reverts commit 747fe345.
parent 04ce9d28
......@@ -530,10 +530,9 @@ class RenderParagraph extends RenderBox
// Only constrain the width to the maximum width of the paragraph.
// Leave height unconstrained, which will overflow if expanded past.
child.layout(
// The content will be enlarged by textScaleFactor during painting phase.
// We reduce contraint by textScaleFactor so that the content will fit
// into the box once it is enlarged.
BoxConstraints(maxWidth: constraints.maxWidth) / textScaleFactor,
BoxConstraints(
maxWidth: constraints.maxWidth,
),
parentUsesSize: true,
);
double baselineOffset;
......
......@@ -163,68 +163,6 @@ void main() {
expect(tester.takeException(), null);
}, skip: isBrowser); // TODO(yjbanov): https://github.com/flutter/flutter/issues/42086
testWidgets('inline widgets works with textScaleFactor', (WidgetTester tester) async {
// Regression test for https://github.com/flutter/flutter/issues/59316
final UniqueKey key = UniqueKey();
double textScaleFactor = 1.0;
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
appBar: AppBar(title: const Text('title')),
body: Center(
child: Text.rich(
TextSpan(
children: <InlineSpan>[
WidgetSpan(
child: RichText(
text: const TextSpan(text: 'widget should be truncated'),
textDirection: TextDirection.ltr,
),
),
],
),
key: key,
textDirection: TextDirection.ltr,
textScaleFactor: textScaleFactor,
),
),
),
),
);
RenderBox renderText = tester.renderObject(find.byKey(key));
final double singleLineHeight = renderText.size.height;
// Now, increases the text scale factor by 5 times.
textScaleFactor = textScaleFactor * 5;
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
appBar: AppBar(title: const Text('title')),
body: Center(
child: Text.rich(
TextSpan(
children: <InlineSpan>[
WidgetSpan(
child: RichText(
text: const TextSpan(text: 'widget should be truncated'),
textDirection: TextDirection.ltr,
),
),
],
),
key: key,
textDirection: TextDirection.ltr,
textScaleFactor: textScaleFactor,
),
),
),
),
);
renderText = tester.renderObject(find.byKey(key));
// The RichText in the widget span should wrap into three lines.
expect(renderText.size.height, singleLineHeight * textScaleFactor * 3);
}, skip: isBrowser); // TODO(yjbanov): https://github.com/flutter/flutter/issues/42086
testWidgets('semanticsLabel can override text label', (WidgetTester tester) async {
final SemanticsTester semantics = SemanticsTester(tester);
await tester.pumpWidget(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment