Revert "M3 Button padding adjustments (#118449)" (#118598)
This reverts commit 8c2fdb803e49b361235bf6b55e98cb2df7a167e0.
diff --git a/examples/api/lib/material/app_bar/app_bar.1.dart b/examples/api/lib/material/app_bar/app_bar.1.dart
index 2f4eb93..9ded23b 100644
--- a/examples/api/lib/material/app_bar/app_bar.1.dart
+++ b/examples/api/lib/material/app_bar/app_bar.1.dart
@@ -98,7 +98,7 @@
label: const Text('shadow color'),
),
const SizedBox(width: 5),
- ElevatedButton(
+ ElevatedButton.icon(
onPressed: () {
if (scrolledUnderElevation == null) {
setState(() {
@@ -111,7 +111,8 @@
});
}
},
- child: Text(
+ icon: const Icon(Icons.add),
+ label: Text(
'scrolledUnderElevation: ${scrolledUnderElevation ?? 'default'}',
),
),
diff --git a/packages/flutter/lib/src/material/elevated_button.dart b/packages/flutter/lib/src/material/elevated_button.dart
index 3b6c659..94b6dfc 100644
--- a/packages/flutter/lib/src/material/elevated_button.dart
+++ b/packages/flutter/lib/src/material/elevated_button.dart
@@ -333,10 +333,10 @@
/// * hovered - 3
/// * focused or pressed - 1
/// * `padding`
- /// * `textScaleFactor <= 1` - horizontal(24)
- /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12))
- /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6))
- /// * `3 < textScaleFactor` - horizontal(6)
+ /// * `textScaleFactor <= 1` - horizontal(16)
+ /// * `1 < textScaleFactor <= 2` - lerp(horizontal(16), horizontal(8))
+ /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4))
+ /// * `3 < textScaleFactor` - horizontal(4)
/// * `minimumSize` - Size(64, 40)
/// * `fixedSize` - null
/// * `maximumSize` - Size.infinite
@@ -351,10 +351,6 @@
/// * `enableFeedback` - true
/// * `alignment` - Alignment.center
/// * `splashFactory` - Theme.splashFactory
- ///
- /// For the [ElevatedButton.icon] factory, the start (generally the left) value of
- /// [padding] is reduced from 24 to 16.
-
@override
ButtonStyle defaultStyleOf(BuildContext context) {
final ThemeData theme = Theme.of(context);
@@ -394,12 +390,10 @@
}
EdgeInsetsGeometry _scaledPadding(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- final double padding1x = useMaterial3 ? 24.0 : 16.0;
return ButtonStyleButton.scaledPadding(
- EdgeInsets.symmetric(horizontal: padding1x),
- EdgeInsets.symmetric(horizontal: padding1x / 2),
- EdgeInsets.symmetric(horizontal: padding1x / 2 / 2),
+ const EdgeInsets.symmetric(horizontal: 16),
+ const EdgeInsets.symmetric(horizontal: 8),
+ const EdgeInsets.symmetric(horizontal: 4),
MediaQuery.textScaleFactorOf(context),
);
}
@@ -502,13 +496,7 @@
@override
ButtonStyle defaultStyleOf(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- final EdgeInsetsGeometry scaledPadding = useMaterial3 ? ButtonStyleButton.scaledPadding(
- const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0),
- const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0),
- const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0),
- MediaQuery.textScaleFactorOf(context),
- ) : ButtonStyleButton.scaledPadding(
+ final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding(
const EdgeInsetsDirectional.fromSTEB(12, 0, 16, 0),
const EdgeInsets.symmetric(horizontal: 8),
const EdgeInsetsDirectional.fromSTEB(8, 0, 4, 0),
diff --git a/packages/flutter/lib/src/material/filled_button.dart b/packages/flutter/lib/src/material/filled_button.dart
index 0f3f77e..69efdde 100644
--- a/packages/flutter/lib/src/material/filled_button.dart
+++ b/packages/flutter/lib/src/material/filled_button.dart
@@ -345,50 +345,6 @@
/// shape's [OutlinedBorder.side]. Typically the default value of an
/// [OutlinedBorder]'s side is [BorderSide.none], so an outline is not drawn.
///
- /// ## Material 3 defaults
- ///
- /// If [ThemeData.useMaterial3] is set to true the following defaults will
- /// be used:
- ///
- /// * `textStyle` - Theme.textTheme.labelLarge
- /// * `backgroundColor`
- /// * disabled - Theme.colorScheme.onSurface(0.12)
- /// * others - Theme.colorScheme.secondaryContainer
- /// * `foregroundColor`
- /// * disabled - Theme.colorScheme.onSurface(0.38)
- /// * others - Theme.colorScheme.onSecondaryContainer
- /// * `overlayColor`
- /// * hovered - Theme.colorScheme.onSecondaryContainer(0.08)
- /// * focused or pressed - Theme.colorScheme.onSecondaryContainer(0.12)
- /// * `shadowColor` - Theme.colorScheme.shadow
- /// * `surfaceTintColor` - Colors.transparent
- /// * `elevation`
- /// * disabled - 0
- /// * default - 1
- /// * hovered - 3
- /// * focused or pressed - 1
- /// * `padding`
- /// * `textScaleFactor <= 1` - horizontal(24)
- /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12))
- /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6))
- /// * `3 < textScaleFactor` - horizontal(6)
- /// * `minimumSize` - Size(64, 40)
- /// * `fixedSize` - null
- /// * `maximumSize` - Size.infinite
- /// * `side` - null
- /// * `shape` - StadiumBorder()
- /// * `mouseCursor`
- /// * disabled - SystemMouseCursors.basic
- /// * others - SystemMouseCursors.click
- /// * `visualDensity` - Theme.visualDensity
- /// * `tapTargetSize` - Theme.materialTapTargetSize
- /// * `animationDuration` - kThemeChangeDuration
- /// * `enableFeedback` - true
- /// * `alignment` - Alignment.center
- /// * `splashFactory` - Theme.splashFactory
- ///
- /// For the [FilledButton.icon] factory, the start (generally the left) value of
- /// [padding] is reduced from 24 to 16.
@override
ButtonStyle defaultStyleOf(BuildContext context) {
switch (_variant) {
@@ -408,12 +364,10 @@
}
EdgeInsetsGeometry _scaledPadding(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- final double padding1x = useMaterial3 ? 24.0 : 16.0;
return ButtonStyleButton.scaledPadding(
- EdgeInsets.symmetric(horizontal: padding1x),
- EdgeInsets.symmetric(horizontal: padding1x / 2),
- EdgeInsets.symmetric(horizontal: padding1x / 2 / 2),
+ const EdgeInsets.symmetric(horizontal: 16),
+ const EdgeInsets.symmetric(horizontal: 8),
+ const EdgeInsets.symmetric(horizontal: 4),
MediaQuery.textScaleFactorOf(context),
);
}
@@ -513,13 +467,7 @@
@override
ButtonStyle defaultStyleOf(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- final EdgeInsetsGeometry scaledPadding = useMaterial3 ? ButtonStyleButton.scaledPadding(
- const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0),
- const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0),
- const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0),
- MediaQuery.textScaleFactorOf(context),
- ) : ButtonStyleButton.scaledPadding(
+ final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding(
const EdgeInsetsDirectional.fromSTEB(12, 0, 16, 0),
const EdgeInsets.symmetric(horizontal: 8),
const EdgeInsetsDirectional.fromSTEB(8, 0, 4, 0),
diff --git a/packages/flutter/lib/src/material/outlined_button.dart b/packages/flutter/lib/src/material/outlined_button.dart
index 1d9633e..b692cec 100644
--- a/packages/flutter/lib/src/material/outlined_button.dart
+++ b/packages/flutter/lib/src/material/outlined_button.dart
@@ -287,10 +287,10 @@
/// * `surfaceTintColor` - null
/// * `elevation` - 0
/// * `padding`
- /// * `textScaleFactor <= 1` - horizontal(24)
- /// * `1 < textScaleFactor <= 2` - lerp(horizontal(24), horizontal(12))
- /// * `2 < textScaleFactor <= 3` - lerp(horizontal(12), horizontal(6))
- /// * `3 < textScaleFactor` - horizontal(6)
+ /// * `textScaleFactor <= 1` - horizontal(16)
+ /// * `1 < textScaleFactor <= 2` - lerp(horizontal(16), horizontal(8))
+ /// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4))
+ /// * `3 < textScaleFactor` - horizontal(4)
/// * `minimumSize` - Size(64, 40)
/// * `fixedSize` - null
/// * `maximumSize` - Size.infinite
@@ -307,9 +307,6 @@
/// * `enableFeedback` - true
/// * `alignment` - Alignment.center
/// * `splashFactory` - Theme.splashFactory
- ///
- /// For the [OutlinedButton.icon] factory, the start (generally the left) value of
- /// [padding] is reduced from 24 to 16.
@override
ButtonStyle defaultStyleOf(BuildContext context) {
final ThemeData theme = Theme.of(context);
@@ -350,12 +347,10 @@
}
EdgeInsetsGeometry _scaledPadding(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- final double padding1x = useMaterial3 ? 24.0 : 16.0;
return ButtonStyleButton.scaledPadding(
- EdgeInsets.symmetric(horizontal: padding1x),
- EdgeInsets.symmetric(horizontal: padding1x / 2),
- EdgeInsets.symmetric(horizontal: padding1x / 2 / 2),
+ const EdgeInsets.symmetric(horizontal: 16),
+ const EdgeInsets.symmetric(horizontal: 8),
+ const EdgeInsets.symmetric(horizontal: 4),
MediaQuery.textScaleFactorOf(context),
);
}
@@ -429,23 +424,6 @@
clipBehavior: clipBehavior ?? Clip.none,
child: _OutlinedButtonWithIconChild(icon: icon, label: label),
);
-
- @override
- ButtonStyle defaultStyleOf(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
- if (!useMaterial3) {
- return super.defaultStyleOf(context);
- }
- final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding(
- const EdgeInsetsDirectional.fromSTEB(16, 0, 24, 0),
- const EdgeInsetsDirectional.fromSTEB(8, 0, 12, 0),
- const EdgeInsetsDirectional.fromSTEB(4, 0, 6, 0),
- MediaQuery.textScaleFactorOf(context),
- );
- return super.defaultStyleOf(context).copyWith(
- padding: MaterialStatePropertyAll<EdgeInsetsGeometry>(scaledPadding),
- );
- }
}
class _OutlinedButtonWithIconChild extends StatelessWidget {
diff --git a/packages/flutter/lib/src/material/text_button.dart b/packages/flutter/lib/src/material/text_button.dart
index 97b77ff..a337ac6 100644
--- a/packages/flutter/lib/src/material/text_button.dart
+++ b/packages/flutter/lib/src/material/text_button.dart
@@ -270,7 +270,7 @@
/// * `shadowColor` - Theme.shadowColor
/// * `elevation` - 0
/// * `padding`
- /// * `textScaleFactor <= 1` - (horizontal(12), vertical(8))
+ /// * `textScaleFactor <= 1` - all(8)
/// * `1 < textScaleFactor <= 2` - lerp(all(8), horizontal(8))
/// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4))
/// * `3 < textScaleFactor` - horizontal(4)
@@ -320,7 +320,7 @@
/// * `surfaceTintColor` - null
/// * `elevation` - 0
/// * `padding`
- /// * `textScaleFactor <= 1` - lerp(horizontal(12), horizontal(4))
+ /// * `textScaleFactor <= 1` - all(8)
/// * `1 < textScaleFactor <= 2` - lerp(all(8), horizontal(8))
/// * `2 < textScaleFactor <= 3` - lerp(horizontal(8), horizontal(4))
/// * `3 < textScaleFactor` - horizontal(4)
@@ -338,9 +338,6 @@
/// * `enableFeedback` - true
/// * `alignment` - Alignment.center
/// * `splashFactory` - Theme.splashFactory
- ///
- /// For the [TextButton.icon] factory, the end (generally the right) value of
- /// [padding] is increased from 12 to 16.
/// {@endtemplate}
@override
ButtonStyle defaultStyleOf(BuildContext context) {
@@ -381,9 +378,8 @@
}
EdgeInsetsGeometry _scaledPadding(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
return ButtonStyleButton.scaledPadding(
- useMaterial3 ? const EdgeInsets.symmetric(horizontal: 12, vertical: 8) : const EdgeInsets.all(8),
+ const EdgeInsets.all(8),
const EdgeInsets.symmetric(horizontal: 8),
const EdgeInsets.symmetric(horizontal: 4),
MediaQuery.textScaleFactorOf(context),
@@ -495,9 +491,8 @@
@override
ButtonStyle defaultStyleOf(BuildContext context) {
- final bool useMaterial3 = Theme.of(context).useMaterial3;
final EdgeInsetsGeometry scaledPadding = ButtonStyleButton.scaledPadding(
- useMaterial3 ? const EdgeInsetsDirectional.fromSTEB(12, 8, 16, 8) : const EdgeInsets.all(8),
+ const EdgeInsets.all(8),
const EdgeInsets.symmetric(horizontal: 4),
const EdgeInsets.symmetric(horizontal: 4),
MediaQuery.textScaleFactorOf(context),
diff --git a/packages/flutter/test/material/elevated_button_test.dart b/packages/flutter/test/material/elevated_button_test.dart
index 686fe96..bb0d15f 100644
--- a/packages/flutter/test/material/elevated_button_test.dart
+++ b/packages/flutter/test/material/elevated_button_test.dart
@@ -1147,59 +1147,6 @@
expect(paddingWidget.padding, const EdgeInsets.all(22));
});
- testWidgets('M3 ElevatedButton has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: ElevatedButton(
- key: key,
- onPressed: () {},
- child: const Text('ElevatedButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24));
- });
-
- testWidgets('M3 ElevatedButton.icon has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: ElevatedButton.icon(
- key: key,
- icon: const Icon(Icons.favorite),
- onPressed: () {},
- label: const Text('ElevatedButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0));
- });
-
testWidgets('Elevated buttons animate elevation before color on disable', (WidgetTester tester) async {
// This is a regression test for https://github.com/flutter/flutter/issues/387
diff --git a/packages/flutter/test/material/filled_button_test.dart b/packages/flutter/test/material/filled_button_test.dart
index 235729d..fefdb72 100644
--- a/packages/flutter/test/material/filled_button_test.dart
+++ b/packages/flutter/test/material/filled_button_test.dart
@@ -1224,59 +1224,6 @@
expect(paddingWidget.padding, const EdgeInsets.all(22));
});
- testWidgets('M3 FilledButton has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: ElevatedButton(
- key: key,
- onPressed: () {},
- child: const Text('FilledButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24));
- });
-
- testWidgets('M3 FilledButton.icon has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: FilledButton.icon(
- key: key,
- icon: const Icon(Icons.favorite),
- onPressed: () {},
- label: const Text('ElevatedButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0));
- });
-
testWidgets('By default, FilledButton shape outline is defined by shape.side', (WidgetTester tester) async {
const Color borderColor = Color(0xff4caf50);
await tester.pumpWidget(
diff --git a/packages/flutter/test/material/outlined_button_test.dart b/packages/flutter/test/material/outlined_button_test.dart
index d53af3e..0bfb6e5 100644
--- a/packages/flutter/test/material/outlined_button_test.dart
+++ b/packages/flutter/test/material/outlined_button_test.dart
@@ -1388,59 +1388,6 @@
expect(paddingWidget.padding, const EdgeInsets.all(22));
});
- testWidgets('M3 OutlinedButton has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: OutlinedButton(
- key: key,
- onPressed: () {},
- child: const Text('OutlinedButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 24));
- });
-
- testWidgets('M3 OutlinedButton.icon has correct padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: OutlinedButton.icon(
- key: key,
- icon: const Icon(Icons.favorite),
- onPressed: () {},
- label: const Text('OutlinedButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 24.0, 0.0));
- });
-
testWidgets('Fixed size OutlinedButtons', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
diff --git a/packages/flutter/test/material/text_button_test.dart b/packages/flutter/test/material/text_button_test.dart
index 224b4c6..17fd102 100644
--- a/packages/flutter/test/material/text_button_test.dart
+++ b/packages/flutter/test/material/text_button_test.dart
@@ -1195,59 +1195,6 @@
expect(paddingWidget.padding, const EdgeInsets.all(22));
});
- testWidgets('M3 TextButton has correct default padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: TextButton(
- key: key,
- onPressed: () {},
- child: const Text('TextButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsets.symmetric(horizontal: 12,vertical: 8));
- });
-
- testWidgets('M3 TextButton.icon has correct default padding', (WidgetTester tester) async {
- final Key key = UniqueKey();
- await tester.pumpWidget(
- MaterialApp(
- theme: ThemeData.from(colorScheme: const ColorScheme.light(), useMaterial3: true),
- home: Scaffold(
- body: Center(
- child: TextButton.icon(
- key: key,
- onPressed: () {},
- icon: const Icon(Icons.add),
- label: const Text('TextButton'),
- ),
- ),
- ),
- ),
- );
-
- final Padding paddingWidget = tester.widget<Padding>(
- find.descendant(
- of: find.byKey(key),
- matching: find.byType(Padding),
- ),
- );
- expect(paddingWidget.padding, const EdgeInsetsDirectional.fromSTEB(12, 8, 16, 8));
- });
-
testWidgets('Fixed size TextButtons', (WidgetTester tester) async {
await tester.pumpWidget(
MaterialApp(
