Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: sky/sdk/lib/widgets/tabs.dart

Issue 1215313004: Tab bar should have white indicator if primary and accent color are the same (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sky/tests/examples/stocks-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/sdk/lib/widgets/tabs.dart
diff --git a/sky/sdk/lib/widgets/tabs.dart b/sky/sdk/lib/widgets/tabs.dart
index a19344b2a8e466168153e772380ed83d155e5813..5812413fef1f657f97334027da45122fa42ce2e7 100644
--- a/sky/sdk/lib/widgets/tabs.dart
+++ b/sky/sdk/lib/widgets/tabs.dart
@@ -11,6 +11,7 @@ import 'package:sky/painting/text_style.dart';
import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.dart';
import 'package:vector_math/vector_math.dart';
+import 'package:sky/theme/colors.dart' as colors;
import 'package:sky/widgets/basic.dart';
import 'package:sky/widgets/icon.dart';
import 'package:sky/widgets/ink_well.dart';
@@ -433,11 +434,17 @@ class TabBar extends Scrollable {
textAndIcons = true;
}
+ Color backgroundColor = Theme.of(this).primaryColor;
+ Color indicatorColor = Theme.of(this).accentColor;
+ if (indicatorColor == backgroundColor) {
+ indicatorColor = colors.White;
+ }
+
TabBarWrapper tabBarWrapper = new TabBarWrapper(
children: tabs,
selectedIndex: selectedIndex,
- backgroundColor: Theme.of(this).primaryColor,
- indicatorColor: Theme.of(this).accentColor,
+ backgroundColor: backgroundColor,
+ indicatorColor: indicatorColor,
textAndIcons: textAndIcons,
scrollable: scrollable,
onLayoutChanged: scrollable ? _layoutChanged : null
« no previous file with comments | « no previous file | sky/tests/examples/stocks-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698