GTK Themes: Get text color from a label object; this should fix some theme text problems.

chrome/browser/gtk/gtk_theme_provider.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "base/gfx/gtk_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 19 matching lines @@
 
 }  // namespace
 
 // static
 GtkThemeProvider* GtkThemeProvider::GetFrom(Profile* profile) {
   return static_cast<GtkThemeProvider*>(profile->GetThemeProvider());
 }
 
 GtkThemeProvider::GtkThemeProvider()
     : BrowserThemeProvider(),
-      fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)) {
+      fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)),
+      fake_label_(gtk_label_new("")) {
   // Only realized widgets receive style-set notifications, which we need to
   // broadcast new theme images and colors.
   gtk_widget_realize(fake_window_);
   g_signal_connect(fake_window_, "style-set", G_CALLBACK(&OnStyleSet), this);
 }
 
 GtkThemeProvider::~GtkThemeProvider() {
   profile()->GetPrefs()->RemovePrefObserver(prefs::kUsesSystemTheme, this);
   gtk_widget_destroy(fake_window_);
+  gtk_widget_destroy(fake_label_);
 
   // Disconnect from the destroy signal of any redisual widgets in
   // |chrome_buttons_|.
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
        it != chrome_buttons_.end(); ++it) {
     gtk_signal_disconnect_by_data(GTK_OBJECT(*it), this);
   }
 }
 
 void GtkThemeProvider::Init(Profile* profile) {
@@ skipping 98 matching lines @@
                                   GtkStyle* previous_style,
                                   GtkThemeProvider* provider) {
   if (provider->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme)) {
     provider->ClearAllThemeData();
     provider->LoadGtkValues();
     provider->NotifyThemeChanged();
   }
 }
 
 void GtkThemeProvider::LoadGtkValues() {
-  GtkStyle* style = gtk_rc_get_style(fake_window_);
+  GtkStyle* window_style = gtk_rc_get_style(fake_window_);
+  GtkStyle* label_style = gtk_rc_get_style(fake_label_);
 
-  SetThemeColorFromGtk(kColorFrame, &style->bg[GTK_STATE_SELECTED]);
+  SetThemeColorFromGtk(kColorFrame, &window_style->bg[GTK_STATE_SELECTED]);
   // Skip COLOR_FRAME_INACTIVE and the incognito colors, as they will be
   // autogenerated from tints.
   SetThemeColorFromGtk(kColorToolbar,
-                       &style->bg[GTK_STATE_NORMAL]);
+                       &window_style->bg[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorTabText,
-                       &style->text[GTK_STATE_NORMAL]);
+                       &label_style->text[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorBackgroundTabText,

[Evan Stade, 2009/07/21 19:12:19]

shouldn't TabText and BackgroundTabText be different? TabText has to stand out
against ColorToolbar whereas BackgroundTabText has to stand out against
ColorFrame

[Elliot Glaysher, 2009/07/21 19:21:36]

They should, but that's a larger change then this. I'm still sketching out how
I'm going to do that.

-                       &style->text[GTK_STATE_NORMAL]);
+                       &label_style->text[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorBookmarkText,
-                       &style->text[GTK_STATE_NORMAL]);
+                       &label_style->text[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorControlBackground,
-                       &style->bg[GTK_STATE_NORMAL]);
+                       &window_style->bg[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorButtonBackground,
-                       &style->bg[GTK_STATE_NORMAL]);
+                       &window_style->bg[GTK_STATE_NORMAL]);
 
-  SetThemeTintFromGtk(kTintButtons, &style->bg[GTK_STATE_SELECTED],
+  SetThemeTintFromGtk(kTintButtons, &window_style->bg[GTK_STATE_SELECTED],
                       kDefaultTintButtons);
-  SetThemeTintFromGtk(kTintFrame, &style->bg[GTK_STATE_SELECTED],
+  SetThemeTintFromGtk(kTintFrame, &window_style->bg[GTK_STATE_SELECTED],
                       kDefaultTintFrame);
   SetThemeTintFromGtk(kTintFrameIncognito,
-                      &style->bg[GTK_STATE_SELECTED],
+                      &window_style->bg[GTK_STATE_SELECTED],
                       kDefaultTintFrameIncognito);
   SetThemeTintFromGtk(kTintBackgroundTab,
-                      &style->bg[GTK_STATE_SELECTED],
+                      &window_style->bg[GTK_STATE_SELECTED],
                       kDefaultTintBackgroundTab);
 
   // The inactive color/tint is special: We *must* use the exact insensitive
   // color for all inactive windows, otherwise we end up neon pink half the
   // time.
-  SetThemeColorFromGtk(kColorFrameInactive, &style->bg[GTK_STATE_INSENSITIVE]);
+  SetThemeColorFromGtk(kColorFrameInactive,
+                       &window_style->bg[GTK_STATE_INSENSITIVE]);
   SetThemeTintFromGtk(kTintFrameInactive,
-                      &style->bg[GTK_STATE_INSENSITIVE],
+                      &window_style->bg[GTK_STATE_INSENSITIVE],
                       kExactColor);
   SetThemeTintFromGtk(kTintFrameIncognitoInactive,
-                      &style->bg[GTK_STATE_INSENSITIVE],
+                      &window_style->bg[GTK_STATE_INSENSITIVE],
                       kExactColor);
 
   GenerateFrameColors();
   GenerateFrameImages();
 }
 
 void GtkThemeProvider::SetThemeColorFromGtk(const char* id, GdkColor* color) {
   SetColor(id, SkColorSetRGB(color->red >> 8,
                              color->green >> 8,
                              color->blue >> 8));
@@ skipping 14 matching lines @@
 }
 
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }