firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have a default default text style.

Browse Source 
This way, widgets that try to use the DefaultTextStyle don't have to

handle the case where there isn't an explicit default.
This commit is contained in:
Ian Hickson 2016-04-01 16:10:27 -07:00
parent 6d58770499
commit 71e689f450
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/widgets/basic.dart
View File

@ -1682,7 +1682,7 @@ class DefaultTextStyle extends InheritedWidget {
/// The style from the closest instance of this class that encloses the given context. /// The style from the closest instance of this class that encloses the given context.
static TextStyle of(BuildContext context) { static TextStyle of(BuildContext context) {
DefaultTextStyle result = context.inheritFromWidgetOfExactType(DefaultTextStyle); DefaultTextStyle result = context.inheritFromWidgetOfExactType(DefaultTextStyle);
return result?.style; return result?.style ?? const TextStyle();
} }
@override @override
@ -1716,7 +1716,7 @@ class Text extends StatelessWidget {
TextStyle _getEffectiveStyle(BuildContext context) { TextStyle _getEffectiveStyle(BuildContext context) {
if (style == null || style.inherit) if (style == null || style.inherit)
return DefaultTextStyle.of(context)?.merge(style) ?? style; return DefaultTextStyle.of(context).merge(style);
else else
return style; return style;
} }