DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some TabBarTheme mergeOs (#22285)

Browse Source
This commit is contained in:
Hans Muller 2018-09-26 09:11:18 -07:00 committed by GitHub
parent 52697ef962
commit 63efe4c4ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/material/theme_data.dart
View File

@ -187,7 +187,6 @@ class ThemeData extends Diagnosticable {
errorColor ??= Colors.red[700];
inputDecorationTheme ??= const InputDecorationTheme();
pageTransitionsTheme ??= const PageTransitionsTheme();
tabBarTheme ??= const TabBarTheme();
primaryIconTheme ??= primaryIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
accentIconTheme ??= accentIsDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black);
iconTheme ??= isDark ? const IconThemeData(color: Colors.white) : const IconThemeData(color: Colors.black87);
@ -894,12 +893,12 @@ class ThemeData extends Diagnosticable {
primaryIconTheme,
accentIconTheme,
sliderTheme,
chipTheme,
tabBarTheme,
hashValues(
chipTheme,
platform,
materialTapTargetSize,
pageTransitionsTheme,
tabBarTheme,
),
),
);