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

Revert "Prevent text from overflowing in OutlineButton and OutlinedButton label. (#70872)" (#73715)

Browse Source
This commit is contained in:
Hans Muller 2021-01-11 10:19:04 -08:00 committed by GitHub
parent 89197a6667
commit 6f002abcd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/src/material/outline_button.dart
View File

@ -266,7 +266,7 @@ class _OutlineButtonWithIcon extends OutlineButton with MaterialButtonWithIconMi
children: <Widget>[ children: <Widget>[
icon, icon,
const SizedBox(width: 8.0), const SizedBox(width: 8.0),
Flexible(child: label), label,
], ],
), ),
); );

2
packages/flutter/lib/src/material/outlined_button.dart
View File

@ -345,7 +345,7 @@ class _OutlinedButtonWithIconChild extends StatelessWidget {
final double gap = scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!; final double gap = scale <= 1 ? 8 : lerpDouble(8, 4, math.min(scale - 1, 1))!;
return Row( return Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[icon, SizedBox(width: gap), Flexible(child: label)], children: <Widget>[icon, SizedBox(width: gap), label],
); );
} }
} }

16
packages/flutter/test/material/outline_button_test.dart
View File

@ -1222,22 +1222,6 @@ void main() {
expect(box.size, equals(const Size(76, 36))); expect(box.size, equals(const Size(76, 36)));
expect(childRect, equals(const Rect.fromLTRB(372.0, 293.0, 428.0, 307.0))); expect(childRect, equals(const Rect.fromLTRB(372.0, 293.0, 428.0, 307.0)));
}); });
testWidgets('Text does not overflow in OutlineButton label', (WidgetTester tester) async {
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: MouseRegion(
cursor: SystemMouseCursors.forbidden,
child: OutlineButton.icon(
icon: const Icon(Icons.add),
label: const Text('this is a very long text used to check whether an overflow occurs or not'),
onPressed: () {},
),
),
),
);
});
} }
PhysicalModelLayer _findPhysicalLayer(Element element) { PhysicalModelLayer _findPhysicalLayer(Element element) {

16
packages/flutter/test/material/outlined_button_test.dart
View File

@ -1212,22 +1212,6 @@ void main() {
); );
expect(paddingWidget.padding, const EdgeInsets.all(22)); expect(paddingWidget.padding, const EdgeInsets.all(22));
}); });
testWidgets('Text does not overflow in OutlinedButton label', (WidgetTester tester) async {
await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: MouseRegion(
cursor: SystemMouseCursors.forbidden,
child: OutlinedButton.icon(
icon: const Icon(Icons.add),
label: const Text('this is a very long text used to check whether an overflow occurs or not'),
onPressed: () {},
),
),
),
);
});
} }
PhysicalModelLayer _findPhysicalLayer(Element element) { PhysicalModelLayer _findPhysicalLayer(Element element) {