Commit 964a138d authored by xster's avatar xster Committed by GitHub

nav bar font styles are special, do not inherit (#12578)

parent d920fdd1
...@@ -291,19 +291,19 @@ class _CupertinoPersistentNavigationBar extends StatelessWidget implements Prefe ...@@ -291,19 +291,19 @@ class _CupertinoPersistentNavigationBar extends StatelessWidget implements Prefe
color: actionsForegroundColor, color: actionsForegroundColor,
); );
final Widget styledLeading = leading == null ? null : DefaultTextStyle.merge( final Widget styledLeading = leading == null ? null : new DefaultTextStyle(
style: actionsStyle, style: actionsStyle,
child: leading, child: leading,
); );
final Widget styledTrailing = trailing == null ? null : DefaultTextStyle.merge( final Widget styledTrailing = trailing == null ? null : new DefaultTextStyle(
style: actionsStyle, style: actionsStyle,
child: trailing, child: trailing,
); );
// Let the middle be black rather than `actionsForegroundColor` in case // Let the middle be black rather than `actionsForegroundColor` in case
// it's a plain text title. // it's a plain text title.
final Widget styledMiddle = middle == null ? null : DefaultTextStyle.merge( final Widget styledMiddle = middle == null ? null : new DefaultTextStyle(
style: actionsStyle.copyWith( style: actionsStyle.copyWith(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
letterSpacing: -0.72, letterSpacing: -0.72,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment