Chromium Code Reviews| Index: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| index 3dec05e03c2df7ed5ca6e361999b24e5561e8570..b974e12a1c08baec9c92c98db175d56e1552eb1c 100644 |
| --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| @@ -93,6 +93,12 @@ GdkColor SelectedURLColor(GdkColor foreground, GdkColor background) { |
| return libgtk2ui::SkColorToGdkColor(color_utils::HSLToSkColor(output, 255)); |
| } |
| +GdkColor GetReadableColor(const GdkColor& color, const GdkColor& background) { |
| + return libgtk2ui::SkColorToGdkColor( |
| + color_utils::GetReadableColor(libgtk2ui::GdkColorToSkColor(color), |
| + libgtk2ui::GdkColorToSkColor(background))); |
| +} |
| + |
| } // namespace |
| @@ -373,6 +379,43 @@ GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const { |
| return GdkAlphaBlend(win_style->text[GTK_STATE_SELECTED], |
| win_style->bg[GTK_STATE_SELECTED], 0x34); |
| } |
| + case kColorId_ResultsTablePositiveText: { |
| + GdkColor color = {0}; |
|
Evan Stade
2015/03/16 23:39:27
use GDK_COLOR_RGB here and elsewhere.
GdkC
dschuyler
2015/03/17 01:19:28
Done.
|
| + color.green = ~0; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTablePositiveHoveredText: { |
| + GdkColor color = {0}; |
| + color.green = ~0; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTablePositiveSelectedText: { |
| + GdkColor color = {0}; |
| + color.green = ~0; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_SELECTED]); |
| + } |
| + case kColorId_ResultsTableNegativeText: { |
| + GdkColor color = {0}; |
| + color.red = ~0; |
| + color = color; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTableNegativeHoveredText: { |
| + GdkColor color = {0}; |
| + color.red = ~0; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTableNegativeSelectedText: { |
| + GdkColor color = {0}; |
| + color.red = ~0; |
| + GtkStyle* entry_style = GetEntryStyle(); |
| + return GetReadableColor(color, entry_style->base[GTK_STATE_SELECTED]); |
| + } |
| case kColorId_NumColors: |
| NOTREACHED(); |
| break; |