diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:01:50 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 20:01:50 +0000 |
commit | 078370cfd09537c6357fdf5ca46290f4c24934d5 (patch) | |
tree | 6fb90b8b2e546068fd0e9f6a4a331e39b86aedb4 /ui/native_theme | |
parent | 7b66d17ddf52e905b6028305776895d530478b0b (diff) | |
download | chromium_src-078370cfd09537c6357fdf5ca46290f4c24934d5.zip chromium_src-078370cfd09537c6357fdf5ca46290f4c24934d5.tar.gz chromium_src-078370cfd09537c6357fdf5ca46290f4c24934d5.tar.bz2 |
fix text color of BlueButton on GTK-theme-mode Linux Aura.
BUG=375350
Review URL: https://codereview.chromium.org/288983010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/native_theme')
-rw-r--r-- | ui/native_theme/common_theme.cc | 16 | ||||
-rw-r--r-- | ui/native_theme/fallback_theme.cc | 12 | ||||
-rw-r--r-- | ui/native_theme/native_theme.h | 4 |
3 files changed, 32 insertions, 0 deletions
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc index 49d59c8..6f27c41 100644 --- a/ui/native_theme/common_theme.cc +++ b/ui/native_theme/common_theme.cc @@ -34,6 +34,10 @@ const SkColor kHoverMenuItemBackgroundColor = SkColorSetARGB(204, 255, 255, 255); // Button: const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA); +const SkColor kBlueButtonEnabledColor = SK_ColorWHITE; +const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; +const SkColor kBlueButtonHighlightColor = SK_ColorWHITE; +const SkColor kBlueButtonHoverColor = SK_ColorWHITE; } // namespace @@ -85,6 +89,18 @@ bool CommonThemeGetSystemColor(NativeTheme::ColorId color_id, SkColor* color) { case NativeTheme::kColorId_ButtonHoverBackgroundColor: *color = kButtonHoverBackgroundColor; break; + case NativeTheme::kColorId_BlueButtonEnabledColor: + *color = kBlueButtonEnabledColor; + break; + case NativeTheme::kColorId_BlueButtonDisabledColor: + *color = kBlueButtonDisabledColor; + break; + case NativeTheme::kColorId_BlueButtonHighlightColor: + *color = kBlueButtonHighlightColor; + break; + case NativeTheme::kColorId_BlueButtonHoverColor: + *color = kBlueButtonHoverColor; + break; default: return false; } diff --git a/ui/native_theme/fallback_theme.cc b/ui/native_theme/fallback_theme.cc index d995d71..c2a4c91 100644 --- a/ui/native_theme/fallback_theme.cc +++ b/ui/native_theme/fallback_theme.cc @@ -38,6 +38,10 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const { static const SkColor kButtonHoverColor = kButtonEnabledColor; static const SkColor kButtonHoverBackgroundColor = SkColorSetRGB(0xEA, 0xEA, 0xEA); + static const SkColor kBlueButtonEnabledColor = SK_ColorWHITE; + static const SkColor kBlueButtonDisabledColor = SK_ColorWHITE; + static const SkColor kBlueButtonHighlightColor = SK_ColorWHITE; + static const SkColor kBlueButtonHoverColor = SK_ColorWHITE; // MenuItem: static const SkColor kEnabledMenuItemForegroundColor = kButtonEnabledColor; static const SkColor kDisabledMenuItemForegroundColor = kButtonDisabledColor; @@ -142,6 +146,14 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const { return kButtonHoverColor; case kColorId_ButtonHoverBackgroundColor: return kButtonHoverBackgroundColor; + case kColorId_BlueButtonEnabledColor: + return kBlueButtonEnabledColor; + case kColorId_BlueButtonDisabledColor: + return kBlueButtonDisabledColor; + case kColorId_BlueButtonHighlightColor: + return kBlueButtonHighlightColor; + case kColorId_BlueButtonHoverColor: + return kBlueButtonHoverColor; // MenuItem case kColorId_EnabledMenuItemForegroundColor: diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h index 01fccea..76d65ce 100644 --- a/ui/native_theme/native_theme.h +++ b/ui/native_theme/native_theme.h @@ -244,6 +244,10 @@ class NATIVE_THEME_EXPORT NativeTheme { kColorId_ButtonHighlightColor, kColorId_ButtonHoverColor, kColorId_ButtonHoverBackgroundColor, + kColorId_BlueButtonEnabledColor, + kColorId_BlueButtonDisabledColor, + kColorId_BlueButtonHighlightColor, + kColorId_BlueButtonHoverColor, // MenuItem kColorId_EnabledMenuItemForegroundColor, kColorId_DisabledMenuItemForegroundColor, |