Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Limit Dialog max width to 560dp per Material Design spec #170065

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
wants to merge 2 commits into from
Closed

Limit Dialog max width to 560dp per Material Design spec #170065

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e073e
Limit Dialog max width to 560dp per Material Design spec
dogaozyagci Jun 5, 2025
61342b3
Merge branch 'master' into fix-dialog-max-width
dogaozyagci Jun 5, 2025
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
82 changes: 40 additions & 42 deletions 82 packages/flutter/lib/src/material/dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,14 @@ class Dialog extends StatelessWidget {
final EdgeInsets effectivePadding =
MediaQuery.viewInsetsOf(context) +
(insetPadding ?? dialogTheme.insetPadding ?? _defaultInsetPadding);
final DialogThemeData defaults =
theme.useMaterial3
? (_fullscreen ? _DialogFullscreenDefaultsM3(context) : _DialogDefaultsM3(context))
: _DialogDefaultsM2(context);
final DialogThemeData defaults = theme.useMaterial3
? (_fullscreen ? _DialogFullscreenDefaultsM3(context) : _DialogDefaultsM3(context))
: _DialogDefaultsM2(context);

final BoxConstraints boxConstraints =
constraints ?? dialogTheme.constraints ?? const BoxConstraints(minWidth: 280.0);
constraints ??
dialogTheme.constraints ??
const BoxConstraints(minWidth: 280.0, maxWidth: 560.0);
Comment on lines +274 to +276
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maxWidth and minWidth should be extracted to a const with a proper name.


Widget dialogChild;

Expand Down Expand Up @@ -762,8 +763,9 @@ class AlertDialog extends StatelessWidget {
final ThemeData theme = Theme.of(context);

final DialogThemeData dialogTheme = DialogTheme.of(context);
final DialogThemeData defaults =
theme.useMaterial3 ? _DialogDefaultsM3(context) : _DialogDefaultsM2(context);
final DialogThemeData defaults = theme.useMaterial3
? _DialogDefaultsM3(context)
: _DialogDefaultsM2(context);

String? label = semanticLabel;
switch (theme.platform) {
Expand Down Expand Up @@ -797,12 +799,11 @@ class AlertDialog extends StatelessWidget {
left: 24.0,
top: 24.0,
right: 24.0,
bottom:
belowIsTitle
? 16.0
: belowIsContent
? 0.0
: 24.0,
bottom: belowIsTitle
? 16.0
: belowIsContent
? 0.0
: 24.0,
);
final EdgeInsets effectiveIconPadding =
iconPadding?.resolve(textDirection) ?? defaultIconPadding;
Expand Down Expand Up @@ -833,10 +834,9 @@ class AlertDialog extends StatelessWidget {
padding: EdgeInsets.only(
left: effectiveTitlePadding.left * paddingScaleFactor,
right: effectiveTitlePadding.right * paddingScaleFactor,
top:
icon == null
? effectiveTitlePadding.top * paddingScaleFactor
: effectiveTitlePadding.top,
top: icon == null
? effectiveTitlePadding.top * paddingScaleFactor
: effectiveTitlePadding.top,
bottom: effectiveTitlePadding.bottom,
),
child: DefaultTextStyle(
Expand Down Expand Up @@ -866,10 +866,9 @@ class AlertDialog extends StatelessWidget {
padding: EdgeInsets.only(
left: effectiveContentPadding.left * paddingScaleFactor,
right: effectiveContentPadding.right * paddingScaleFactor,
top:
title == null && icon == null
? effectiveContentPadding.top * paddingScaleFactor
: effectiveContentPadding.top,
top: title == null && icon == null
? effectiveContentPadding.top * paddingScaleFactor
: effectiveContentPadding.top,
bottom: effectiveContentPadding.bottom,
),
child: DefaultTextStyle(
Expand Down Expand Up @@ -1299,10 +1298,9 @@ class SimpleDialog extends StatelessWidget {
left: effectiveTitlePadding.left * paddingScaleFactor,
right: effectiveTitlePadding.right * paddingScaleFactor,
top: effectiveTitlePadding.top * paddingScaleFactor,
bottom:
children == null
? effectiveTitlePadding.bottom * paddingScaleFactor
: effectiveTitlePadding.bottom,
bottom: children == null
? effectiveTitlePadding.bottom * paddingScaleFactor
: effectiveTitlePadding.bottom,
),
child: DefaultTextStyle(
style: defaultTextStyle,
Expand All @@ -1325,10 +1323,9 @@ class SimpleDialog extends StatelessWidget {
padding: EdgeInsets.only(
left: effectiveContentPadding.left * paddingScaleFactor,
right: effectiveContentPadding.right * paddingScaleFactor,
top:
title == null
? effectiveContentPadding.top * paddingScaleFactor
: effectiveContentPadding.top,
top: title == null
? effectiveContentPadding.top * paddingScaleFactor
: effectiveContentPadding.top,
bottom: effectiveContentPadding.bottom * paddingScaleFactor,
),
child: ListBody(children: children!),
Expand All @@ -1339,7 +1336,7 @@ class SimpleDialog extends StatelessWidget {
Widget dialogChild = IntrinsicWidth(
stepWidth: 56.0,
child: ConstrainedBox(
constraints: const BoxConstraints(minWidth: 280.0),
constraints: const BoxConstraints(minWidth: 280.0, maxWidth: 560.0),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maxWidth and minWidth should be extracted to a const with a proper name.

child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
Expand Down Expand Up @@ -1664,18 +1661,19 @@ class DialogRoute<T> extends RawDialogRoute<T> {
AnimationStyle? animationStyle,
}) : _animationStyle = animationStyle,
super(
pageBuilder: (
BuildContext buildContext,
Animation<double> animation,
Animation<double> secondaryAnimation,
) {
final Widget pageChild = Builder(builder: builder);
Widget dialog = themes?.wrap(pageChild) ?? pageChild;
if (useSafeArea) {
dialog = SafeArea(child: dialog);
}
return dialog;
},
pageBuilder:
(
BuildContext buildContext,
Animation<double> animation,
Animation<double> secondaryAnimation,
) {
final Widget pageChild = Builder(builder: builder);
Widget dialog = themes?.wrap(pageChild) ?? pageChild;
if (useSafeArea) {
dialog = SafeArea(child: dialog);
}
return dialog;
},
barrierLabel: barrierLabel ?? MaterialLocalizations.of(context).modalBarrierDismissLabel,
transitionDuration: animationStyle?.duration ?? const Duration(milliseconds: 150),
transitionBuilder: _buildMaterialDialogTransitions,
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.