development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-30 06:23:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed leading button size on app bar (#110043)

Browse source
This commit is contained in:
Qun Cheng 2022-08-22 15:37:10 -07:00 committed by GitHub
parent d79a3d7a19
commit 7e33cd5ef3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/flutter/lib/src/material/app_bar.dart
View file

@ -998,11 +998,16 @@ class _AppBarState extends State<AppBar> {
}
}
if (leading != null) {
leading = Container(
alignment: Alignment.center,
constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
child: leading,
);
leading = theme.useMaterial3
? Container(
alignment: Alignment.center,
constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
child: leading,
)
: ConstrainedBox(
constraints: BoxConstraints.tightFor(width: widget.leadingWidth ?? _kLeadingWidth),
child: leading,
);
}
Widget? title = widget.title;

10
packages/flutter/test/material/app_bar_test.dart
View file

@ -694,9 +694,11 @@ void main() {
});
testWidgets('leading button extends to edge and is square', (WidgetTester tester) async {
final ThemeData themeData = ThemeData(platform: TargetPlatform.android);
final bool material3 = themeData.useMaterial3;
await tester.pumpWidget(
MaterialApp(
theme: ThemeData(platform: TargetPlatform.android),
theme: themeData,
home: Scaffold(
appBar: AppBar(
title: const Text('X'),
@ -706,9 +708,9 @@ void main() {
),
);
final Finder hamburger = find.byTooltip('Open navigation menu');
expect(tester.getTopLeft(hamburger), const Offset(4.0, 4.0));
expect(tester.getSize(hamburger), const Size(48.0, 48.0));
final Finder hamburger = find.byType(IconButton);
expect(tester.getTopLeft(hamburger), material3 ? const Offset(4.0, 4.0) : Offset.zero);
expect(tester.getSize(hamburger), material3 ? const Size(48.0, 48.0) : const Size(56.0, 56.0));
});
testWidgets('test action is 4dp from edge and 48dp min', (WidgetTester tester) async {