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

Unified Diff: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc

Issue 795933009: [AiS] for desktop, two lines and font sytles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added RenderText AppendText Created 5 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698