Skip to content

F
Front-End
Unverified Commit 720dac54 authored by Hans Muller's avatar Hans Muller Committed by GitHub
Browse files
Options

Revert "Fixed Buttons with icon RenderFlex overflow (#78018)" (#78825)

parent 6952c1cf
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 126 deletions
packages/flutter/lib/src/material/elevated_button.dart
View file @ 720dac54
......@@ -468,7 +468,7 @@ class _ElevatedButtonWithIconChild extends StatelessWidget {
final double gap = scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
return Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[icon, SizedBox(width: gap), Flexible(child: label)],
children: <Widget>[icon, SizedBox(width: gap), label],
);
}
}
packages/flutter/lib/src/material/flat_button.dart
View file @ 720dac54
......@@ -229,7 +229,7 @@ class _FlatButtonWithIcon extends FlatButton with MaterialButtonWithIconMixin {
children: <Widget>[
icon,
const SizedBox(width: 8.0),
Flexible(child: label),
label,
],
),
minWidth: minWidth,
......
packages/flutter/lib/src/material/outline_button.dart
View file @ 720dac54
......@@ -274,7 +274,7 @@ class _OutlineButtonWithIcon extends OutlineButton with MaterialButtonWithIconMi
children: <Widget>[
icon,
const SizedBox(width: 8.0),
Flexible(child:label),
label,
],
),
);
......
packages/flutter/lib/src/material/outlined_button.dart
View file @ 720dac54
......@@ -374,7 +374,7 @@ class _OutlinedButtonWithIconChild extends StatelessWidget {
final double gap = scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
return Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[icon, SizedBox(width: gap), Flexible(child:label)],
children: <Widget>[icon, SizedBox(width: gap), label],
);
}
}
packages/flutter/lib/src/material/raised_button.dart
View file @ 720dac54
......@@ -265,7 +265,7 @@ class _RaisedButtonWithIcon extends RaisedButton with MaterialButtonWithIconMixi
children: <Widget>[
icon,
const SizedBox(width: 8.0),
Flexible(child: label),
label,
],
),
);
......
packages/flutter/lib/src/material/text_button.dart
View file @ 720dac54
......@@ -465,7 +465,7 @@ class _TextButtonWithIconChild extends StatelessWidget {
final double gap = scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
return Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[icon, SizedBox(width: gap), Flexible(child:label)],
children: <Widget>[icon, SizedBox(width: gap), label],
);
}
}
packages/flutter/test/material/elevated_button_test.dart
View file @ 720dac54
......@@ -1114,26 +1114,6 @@ void main() {
await tester.pumpAndSettle();
}
});
testWidgets('Fixed ElevatedButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: ElevatedButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
TextStyle _iconStyle(WidgetTester tester, IconData icon) {
......
packages/flutter/test/material/flat_button_test.dart
View file @ 720dac54
......@@ -882,26 +882,6 @@ void main() {
await buildWidget(buttonMinWidth: buttonMinWidth);
expect(tester.widget<RawMaterialButton>(rawMaterialButtonFinder).constraints.minWidth, buttonMinWidth);
});
testWidgets('Fixed FlatButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: FlatButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
TextStyle? _iconStyle(WidgetTester tester, IconData icon) {
......
packages/flutter/test/material/outline_button_test.dart
View file @ 720dac54
......@@ -1222,26 +1222,6 @@ void main() {
expect(box.size, equals(const Size(76, 36)));
expect(childRect, equals(const Rect.fromLTRB(372.0, 293.0, 428.0, 307.0)));
});
testWidgets('Fixed OutlineButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: OutlineButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
PhysicalModelLayer _findPhysicalLayer(Element element) {
......
packages/flutter/test/material/outlined_button_test.dart
View file @ 720dac54
......@@ -1290,26 +1290,6 @@ void main() {
await tester.pumpAndSettle();
}
});
testWidgets('Fixed OutlinedButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: OutlinedButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
PhysicalModelLayer _findPhysicalLayer(Element element) {
......
packages/flutter/test/material/raised_button_test.dart
View file @ 720dac54
......@@ -727,26 +727,6 @@ void main() {
expect(paddingRect.top, tallerWidget.top - 5);
expect(paddingRect.bottom, tallerWidget.bottom + 12);
});
testWidgets('Fixed RaisedButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: RaisedButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
TextStyle _iconStyle(WidgetTester tester, IconData icon) {
......
packages/flutter/test/material/text_button_test.dart
View file @ 720dac54
......@@ -1087,26 +1087,6 @@ void main() {
await tester.pumpAndSettle();
}
});
testWidgets('Fixed TextButton.icon RenderFlex overflow', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
home: Scaffold(
body: SizedBox(
width: 200,
child: TextButton.icon(
onPressed: () {},
icon: const Icon(Icons.add),
label: const Text(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut a euismod nibh. Morbi laoreet purus.',
),
),
),
),
),
);
expect(tester.takeException(), null);
});
}
TextStyle? _iconStyle(WidgetTester tester, IconData icon) {
......
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

HIAST - GitLab