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

Side by Side Diff: ui/native_theme/common_theme.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/native_theme/common_theme.h" 5 #include "ui/native_theme/common_theme.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0); 130 static const SkColor kButtonHighlightColor = SkColorSetRGB(0, 0, 0);
131 static const SkColor kButtonHoverColor = kButtonEnabledColor; 131 static const SkColor kButtonHoverColor = kButtonEnabledColor;
132 static const SkColor kButtonHoverBackgroundColor = 132 static const SkColor kButtonHoverBackgroundColor =
133 SkColorSetRGB(0xEA, 0xEA, 0xEA); 133 SkColorSetRGB(0xEA, 0xEA, 0xEA);
134 static const SkColor kBlueButtonEnabledColor = SK_ColorWHITE; 134 static const SkColor kBlueButtonEnabledColor = SK_ColorWHITE;
135 static const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; 135 static const SkColor kBlueButtonDisabledColor = SK_ColorWHITE;
136 static const SkColor kBlueButtonPressedColor = SK_ColorWHITE; 136 static const SkColor kBlueButtonPressedColor = SK_ColorWHITE;
137 static const SkColor kBlueButtonHoverColor = SK_ColorWHITE; 137 static const SkColor kBlueButtonHoverColor = SK_ColorWHITE;
138 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA); 138 static const SkColor kBlueButtonShadowColor = SkColorSetRGB(0x53, 0x8C, 0xEA);
139 static const SkColor kCallToActionColor = gfx::kGoogleBlue500; 139 static const SkColor kCallToActionColor = gfx::kGoogleBlue500;
140 static const SkColor kCallToActionDisabledColor =
141 SkColorSetA(kCallToActionColor, 255.0 * 0.38);
140 static const SkColor kTextOnCallToActionColor = SK_ColorWHITE; 142 static const SkColor kTextOnCallToActionColor = SK_ColorWHITE;
141 // MenuItem: 143 // MenuItem:
142 static const SkColor kMenuBackgroundColor = SK_ColorWHITE; 144 static const SkColor kMenuBackgroundColor = SK_ColorWHITE;
143 static const SkColor kMenuHighlightBackgroundColor = 145 static const SkColor kMenuHighlightBackgroundColor =
144 SkColorSetRGB(0x42, 0x81, 0xF4); 146 SkColorSetRGB(0x42, 0x81, 0xF4);
145 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA); 147 static const SkColor kMenuBorderColor = SkColorSetRGB(0xBA, 0xBA, 0xBA);
146 static const SkColor kEnabledMenuButtonBorderColor = 148 static const SkColor kEnabledMenuButtonBorderColor =
147 SkColorSetARGB(0x24, 0x00, 0x00, 0x00); 149 SkColorSetARGB(0x24, 0x00, 0x00, 0x00);
148 static const SkColor kFocusedMenuButtonBorderColor = 150 static const SkColor kFocusedMenuButtonBorderColor =
149 SkColorSetARGB(0x48, 0x00, 0x00, 0x00); 151 SkColorSetARGB(0x48, 0x00, 0x00, 0x00);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 case NativeTheme::kColorId_BlueButtonDisabledColor: 267 case NativeTheme::kColorId_BlueButtonDisabledColor:
266 return kBlueButtonDisabledColor; 268 return kBlueButtonDisabledColor;
267 case NativeTheme::kColorId_BlueButtonPressedColor: 269 case NativeTheme::kColorId_BlueButtonPressedColor:
268 return kBlueButtonPressedColor; 270 return kBlueButtonPressedColor;
269 case NativeTheme::kColorId_BlueButtonHoverColor: 271 case NativeTheme::kColorId_BlueButtonHoverColor:
270 return kBlueButtonHoverColor; 272 return kBlueButtonHoverColor;
271 case NativeTheme::kColorId_BlueButtonShadowColor: 273 case NativeTheme::kColorId_BlueButtonShadowColor:
272 return kBlueButtonShadowColor; 274 return kBlueButtonShadowColor;
273 case NativeTheme::kColorId_CallToActionColor: 275 case NativeTheme::kColorId_CallToActionColor:
274 return kCallToActionColor; 276 return kCallToActionColor;
277 case NativeTheme::kColorId_CallToActionDisabledColor:
278 return kCallToActionDisabledColor;
275 case NativeTheme::kColorId_TextOnCallToActionColor: 279 case NativeTheme::kColorId_TextOnCallToActionColor:
276 return kTextOnCallToActionColor; 280 return kTextOnCallToActionColor;
277 281
278 // MenuItem 282 // MenuItem
279 case NativeTheme::kColorId_MenuBorderColor: 283 case NativeTheme::kColorId_MenuBorderColor:
280 return kMenuBorderColor; 284 return kMenuBorderColor;
281 case NativeTheme::kColorId_EnabledMenuButtonBorderColor: 285 case NativeTheme::kColorId_EnabledMenuButtonBorderColor:
282 return kEnabledMenuButtonBorderColor; 286 return kEnabledMenuButtonBorderColor;
283 case NativeTheme::kColorId_FocusedMenuButtonBorderColor: 287 case NativeTheme::kColorId_FocusedMenuButtonBorderColor:
284 return kFocusedMenuButtonBorderColor; 288 return kFocusedMenuButtonBorderColor;
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 } 456 }
453 if (menu_item.corner_radius > 0) { 457 if (menu_item.corner_radius > 0) {
454 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); 458 const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
455 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint); 459 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
456 return; 460 return;
457 } 461 }
458 canvas->drawRect(gfx::RectToSkRect(rect), paint); 462 canvas->drawRect(gfx::RectToSkRect(rect), paint);
459 } 463 }
460 464
461 } // namespace ui 465 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/native_theme/native_theme.h » ('j') | ui/native_theme/native_theme_dark_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698