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..176d40d36cd545898d35ee1b19348959585d7424 100644 |
| --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| @@ -10,6 +10,7 @@ |
| #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
| #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" |
| #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" |
| +#include "third_party/skia/include/core/SkColor.h" |
| #include "ui/gfx/color_utils.h" |
| #include "ui/gfx/geometry/rect.h" |
| #include "ui/gfx/geometry/size.h" |
| @@ -93,6 +94,11 @@ GdkColor SelectedURLColor(GdkColor foreground, GdkColor background) { |
| return libgtk2ui::SkColorToGdkColor(color_utils::HSLToSkColor(output, 255)); |
| } |
| +GdkColor GetReadableColor(uint32_t color, const GdkColor& background) { |
| + return libgtk2ui::SkColorToGdkColor(color_utils::GetReadableColor( |
| + color, libgtk2ui::GdkColorToSkColor(background))); |
| +} |
| + |
| } // namespace |
| @@ -373,6 +379,30 @@ 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: { |
|
msw
2015/03/18 18:03:36
Colors have different meanings in other cultures.
dschuyler
2015/03/18 19:16:48
Excellent point. So far the UI doc says red and g
msw
2015/03/18 20:20:16
Filing a bug would be a good way to loop in the ri
Justin Donnelly
2015/03/18 20:42:57
It's probably also worth checking in first with jo
|
| + return GetReadableColor(SK_ColorGREEN, |
|
msw
2015/03/18 18:03:36
Should the positive/negative base colors have thei
dschuyler
2015/03/18 19:16:48
I'm trying to understand what you mean - like as a
msw
2015/03/18 20:20:16
I meant either (1) Making kColorId_ResultsTable[Po
Peter Kasting
2015/03/18 22:19:33
(1) would make sense if we need it (but we don't k
|
| + GetEntryStyle()->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTablePositiveHoveredText: { |
| + return GetReadableColor(SK_ColorGREEN, |
| + GetEntryStyle()->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTablePositiveSelectedText: { |
| + return GetReadableColor(SK_ColorGREEN, |
| + GetEntryStyle()->base[GTK_STATE_SELECTED]); |
| + } |
| + case kColorId_ResultsTableNegativeText: { |
| + return GetReadableColor(SK_ColorRED, |
| + GetEntryStyle()->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTableNegativeHoveredText: { |
| + return GetReadableColor(SK_ColorRED, |
| + GetEntryStyle()->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTableNegativeSelectedText: { |
| + return GetReadableColor(SK_ColorRED, |
| + GetEntryStyle()->base[GTK_STATE_SELECTED]); |
| + } |
| case kColorId_NumColors: |
| NOTREACHED(); |
| break; |