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

Unified Diff: ui/views/controls/button/md_text_button.cc

Issue 2315233002: views: support disabled color for CTA buttons (Closed)
Patch Set: Created 4 years, 3 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
Index: ui/views/controls/button/md_text_button.cc
diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc
index 44d111c80dff5219baba969b59ba615dc8a2cbe5..205fc0692c10a59dac1b78fe78004e106efc5f49 100644
--- a/ui/views/controls/button/md_text_button.cc
+++ b/ui/views/controls/button/md_text_button.cc
@@ -287,16 +287,25 @@ void MdTextButton::UpdateColors() {
if (!explicitly_set_normal_color())
LabelButton::SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
+ // CTA buttons keep their enabled text color; disabled state is conveyed by
+ // shading the background instead.
+ if (is_cta_)
+ SetTextColor(STATE_DISABLED, theme->GetSystemColor(fg_color_id));
+
SkColor text_color = label()->enabled_color();
- SkColor bg_color =
- bg_color_override_
- ? *bg_color_override_
- : is_cta_
- ? theme->GetSystemColor(
- ui::NativeTheme::kColorId_CallToActionColor)
- : is_default()
- ? color_utils::BlendTowardOppositeLuma(text_color, 0xD8)
- : SK_ColorTRANSPARENT;
+ SkColor bg_color = SK_ColorTRANSPARENT;
+
+ if (bg_color_override_) {
+ bg_color = *bg_color_override_;
+ } else if (is_cta_ && state() == STATE_DISABLED) {
+ bg_color = theme->GetSystemColor(
+ ui::NativeTheme::kColorId_CallToActionDisabledColor);
+ } else if (is_cta_) {
+ bg_color = theme->GetSystemColor(
+ ui::NativeTheme::kColorId_CallToActionColor);
+ } else if (is_default()) {
+ bg_color = color_utils::BlendTowardOppositeLuma(text_color, 0xD8);
+ }
bg_color = PlatformStyle::BackgroundColorForMdButton(bg_color, state());
« ui/native_theme/native_theme_dark_aura.cc ('K') | « ui/native_theme/native_theme_dark_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698