summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 21:20:09 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-22 21:20:09 +0000
commit2123cbae0986af60da4159862d7ac10a417de8fd (patch)
tree8b9ce7d36ffeb19f6b58da774bf738757215ff86
parentf235b061fcb3599f871eba681e60140e286443a5 (diff)
downloadchromium_src-2123cbae0986af60da4159862d7ac10a417de8fd.zip
chromium_src-2123cbae0986af60da4159862d7ac10a417de8fd.tar.gz
chromium_src-2123cbae0986af60da4159862d7ac10a417de8fd.tar.bz2
GTK: When using a dark chrome-theme, make sure we have black text in highlighted
bookmark bar items for contrast. BUG=40372 TEST=none Review URL: http://codereview.chromium.org/4053004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63566 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/bookmark_utils_gtk.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 73190b01..b42c171 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -282,7 +282,13 @@ void SetButtonTextColors(GtkWidget* label, GtkThemeProvider* provider) {
} else {
GdkColor color = provider->GetGdkColor(
BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
- gtk_util::SetLabelColor(label, &color);
+ gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &color);
+ gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &color);
+
+ // Because the prelight state is a white image that doesn't change by the
+ // theme, force the text color to black when it would be used.
+ gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &gfx::kGdkBlack);
+ gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &gfx::kGdkBlack);
}
}