Visitar URL original
Nav bar static components respect ambient MediaQueryData by victorsanni · Pull Request #174673 · flutter/flutter · GitHub
Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Apply review suggestions
  • Loading branch information
victorsanni committed Aug 28, 2025
commit b8f7ec59a5f29fdef0fc881a1aa5c068032eb625
36 changes: 11 additions & 25 deletions packages/flutter/lib/src/cupertino/nav_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2022,11 +2022,7 @@ class _NavigationBarStaticComponents {
child: Padding(
padding: EdgeInsetsDirectional.only(start: padding?.start ?? _kNavBarEdgePadding),
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor),
),
data: MediaQuery.of(context).copyWith(textScaler: _clampedTextScaler(context)),
child: IconTheme.merge(data: const IconThemeData(size: 32.0), child: leadingContent),
),
),
Expand All @@ -2052,11 +2048,7 @@ class _NavigationBarStaticComponents {
return KeyedSubtree(
key: backChevronKey,
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor),
),
data: MediaQuery.of(context).copyWith(textScaler: _clampedTextScaler(context)),
child: const _BackChevron(),
),
);
Expand Down Expand Up @@ -2084,11 +2076,7 @@ class _NavigationBarStaticComponents {
return KeyedSubtree(
key: backLabelKey,
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor),
),
data: MediaQuery.of(context).copyWith(textScaler: _clampedTextScaler(context)),
child: _BackLabel(specifiedPreviousTitle: previousPageTitle, route: route),
),
);
Expand Down Expand Up @@ -2131,11 +2119,7 @@ class _NavigationBarStaticComponents {
return KeyedSubtree(
key: middleKey,
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor),
),
data: MediaQuery.of(context).copyWith(textScaler: _clampedTextScaler(context)),
child: middleContent,
),
);
Expand All @@ -2157,11 +2141,7 @@ class _NavigationBarStaticComponents {
child: Padding(
padding: EdgeInsetsDirectional.only(end: padding?.end ?? _kNavBarEdgePadding),
child: MediaQuery(
data: MediaQuery.of(context).copyWith(
textScaler: MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor),
),
data: MediaQuery.of(context).copyWith(textScaler: _clampedTextScaler(context)),
child: IconTheme.merge(data: const IconThemeData(size: 32.0), child: userTrailing),
),
),
Expand Down Expand Up @@ -2223,6 +2203,12 @@ class _NavigationBarStaticComponents {
),
);
}

static TextScaler _clampedTextScaler(BuildContext context) {
return MediaQuery.textScalerOf(
context,
).clamp(minScaleFactor: 1.0, maxScaleFactor: _kMaxScaleFactor);
}
}

/// A nav bar back button typically used in [CupertinoNavigationBar].
Expand Down