Visitar URL original
Merge pull request #2 from flutter/master · flutter/packages@e21478e · GitHub
Skip to content

Commit e21478e

Browse files
authored
Merge pull request #2 from flutter/master
Updating flutter fork
2 parents 4466a11 + 82b965f commit e21478e

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

‎packages/flutter/lib/src/material/theme.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,18 +142,18 @@ class Theme extends StatelessWidget {
142142
Widget build(BuildContext context) {
143143
return _InheritedTheme(
144144
theme: this,
145-
child: IconTheme(
146-
data: data.iconTheme,
147-
child: CupertinoTheme(
148-
// We're using a MaterialBasedCupertinoThemeData here instead of a
149-
// CupertinoThemeData because it defers some properties to the Material
150-
// ThemeData.
151-
data: MaterialBasedCupertinoThemeData(
152-
materialTheme: data,
153-
),
145+
child: CupertinoTheme(
146+
// We're using a MaterialBasedCupertinoThemeData here instead of a
147+
// CupertinoThemeData because it defers some properties to the Material
148+
// ThemeData.
149+
data: MaterialBasedCupertinoThemeData(
150+
materialTheme: data,
151+
),
152+
child: IconTheme(
153+
data: data.iconTheme,
154154
child: child,
155155
),
156-
),
156+
)
157157
);
158158
}
159159

0 commit comments

Comments
 (0)