Skip to content

Make header responsive to text scale #29734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dnfield wants to merge 1 commit into from
Closed

Make header responsive to text scale #29734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/flutter/lib/src/material/date_picker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ class _DatePickerHeader extends StatelessWidget {
Widget build(BuildContext context) {
final MaterialLocalizations localizations = MaterialLocalizations.of(context);
final ThemeData themeData = Theme.of(context);
final MediaQueryData mediaQuery = MediaQuery.of(context);
final TextTheme headerTextTheme = themeData.primaryTextTheme;
Color dayColor;
Color yearColor;
Expand Down Expand Up @@ -119,12 +120,12 @@ class _DatePickerHeader extends StatelessWidget {
MainAxisAlignment mainAxisAlignment;
switch (orientation) {
case Orientation.portrait:
height = _kDatePickerHeaderPortraitHeight;
height = _kDatePickerHeaderPortraitHeight * mediaQuery.textScaleFactor;
padding = const EdgeInsets.symmetric(horizontal: 16.0);
mainAxisAlignment = MainAxisAlignment.center;
break;
case Orientation.landscape:
width = _kDatePickerHeaderLandscapeWidth;
width = _kDatePickerHeaderLandscapeWidth * mediaQuery.textScaleFactor;
padding = const EdgeInsets.all(8.0);
mainAxisAlignment = MainAxisAlignment.start;
break;
Expand Down
33 changes: 33 additions & 0 deletions packages/flutter/test/material/date_picker_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,4 +773,37 @@ void _tests() {
// button and the right edge of the 800 wide window.
expect(tester.getBottomLeft(find.text('OK')).dx, 800 - ltrOkRight);
});

testWidgets('Header does not overflow when textscale > 1.0', (WidgetTester tester) async {
const Key buttonKey = Key('go button');
await tester.pumpWidget(MaterialApp(
home: Material(
child: Builder(
builder: (BuildContext context) {
return RaisedButton(
key: buttonKey,
onPressed: () {
showDatePicker(
context: context,
initialDate: initialDate,
firstDate: firstDate,
lastDate: lastDate,
builder: (BuildContext context, Widget widget) {
return MediaQuery(
data: MediaQuery.of(context).copyWith(textScaleFactor: 1.5),
child: widget,
);
}
);
},
child: const Text('Go'),
);
},
),
),
));
await tester.tap(find.byKey(buttonKey));
await tester.pumpAndSettle();
expect(find.byType(DayPicker), findsOneWidget);
});
}