Make bookmark bar more amenable to dark themes....

chrome/browser/gtk/bookmark_bar_gtk.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/bookmark_bar_gtk.h"
 
 #include "app/gfx/gtk_util.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 31 matching lines @@
 
 // Dictionary key used to store a BookmarkNode* on a GtkWidget.
 const char kBookmarkNode[] = "bookmark-node";
 
 // Mime types for DnD. Used to synchronize across applications.
 const char kInternalURIType[] = "application/x-chrome-bookmark-item";
 
 // Left-padding for the instructional text.
 const int kInstructionsPadding = 6;
 
+// Color of the button text, taken from TextButtonView.
+const GdkColor kEnabledColor = GDK_COLOR_RGB(6, 45, 117);
+const GdkColor kDisabledColor = GDK_COLOR_RGB(161, 161, 146);
+// TextButtonView uses 255, 255, 255 with opacity of 200. We don't support
+// transparent text though, so just use a slightly lighter version of
+// kEnabledColor.
+const GdkColor kHighlightColor = GDK_COLOR_RGB(56, 95, 167);
+
 // Color of the instructional text.
 const GdkColor kInstructionsColor = GDK_COLOR_RGB(128, 128, 142);
 
+// Only used for the background of the drag widget.
+const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xe6, 0xed, 0xf4);
+
 // Table of the mime types that we accept with their options.
 const GtkTargetEntry kTargetTable[] = {
   { const_cast<char*>(kInternalURIType), GTK_TARGET_SAME_APP,
     dnd::X_CHROME_BOOKMARK_ITEM }
   // TODO(erg): Add "text/uri-list" support.
 };
 
 const int kTargetTableSize = G_N_ELEMENTS(kTargetTable);
 
+// Recursively search for label among the children of |widget|.
+void SearchForLabel(GtkWidget* widget, gpointer data) {
+  if (GTK_IS_LABEL(widget)) {
+    *reinterpret_cast<GtkWidget**>(data) = widget;
+  } else if (GTK_IS_CONTAINER(widget)) {
+    gtk_container_foreach(GTK_CONTAINER(widget), SearchForLabel, data);
+  }
+}
+
+// This function is a temporary hack to fix fonts on dark system themes.
+// NOTE: this makes assumptions about GtkButton internals. Also, it only works
+// if you call it after the last time you edit the button.
+// TODO(estade): remove this function.
+void SetButtonTextColors(GtkWidget* button) {
+  GtkWidget* label;
+  gtk_container_foreach(GTK_CONTAINER(button), SearchForLabel, &label);
+  if (label) {
+    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &kEnabledColor);
+    gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &kEnabledColor);
+    gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &kHighlightColor);
+    gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &kDisabledColor);
+  }
+}
+
 }  // namespace
 
 BookmarkBarGtk::BookmarkBarGtk(Profile* profile, Browser* browser)
     : profile_(NULL),
       page_navigator_(NULL),
       browser_(browser),
       model_(NULL),
       instructions_(NULL),
       show_instructions_(true) {
   Init(profile);
@@ skipping 82 matching lines @@
                    G_CALLBACK(&OnButtonPressed), this);
 
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_.get()), gtk_vseparator_new(),
                      FALSE, FALSE, 0);
 
   other_bookmarks_button_ = gtk_chrome_button_new();
   ConnectFolderButtonEvents(other_bookmarks_button_);
   gtk_button_set_label(
       GTK_BUTTON(other_bookmarks_button_),
       l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_OTHER_BOOKMARKED).c_str());
+
   gtk_button_set_image(GTK_BUTTON(other_bookmarks_button_),
                        gtk_image_new_from_pixbuf(folder_icon));
+  // Set the proper text colors.
+  SetButtonTextColors(other_bookmarks_button_);
 
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_.get()), other_bookmarks_button_,
                      FALSE, FALSE, 0);
   gtk_widget_set_size_request(bookmark_hbox_.get(), -1, 0);
 
   slide_animation_.reset(new SlideAnimation(this));
 }
 
 void BookmarkBarGtk::AddBookmarkbarToBox(GtkWidget* box) {
   gtk_box_pack_start(GTK_BOX(box), bookmark_hbox_.get(), FALSE, FALSE, 0);
@@ skipping 200 matching lines @@
                            gtk_image_new_from_pixbuf(default_bookmark_icon));
     }
   } else {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       static GdkPixbuf* default_bookmark_icon = rb.GetPixbufNamed(
           IDR_BOOKMARK_BAR_FOLDER);
       gtk_button_set_image(GTK_BUTTON(button),
                            gtk_image_new_from_pixbuf(default_bookmark_icon));
   }
 
+  SetButtonTextColors(button);
   g_object_set_data(G_OBJECT(button), kBookmarkNode,
                     reinterpret_cast<void*>(node));
 }
 
 GtkWidget* BookmarkBarGtk::CreateBookmarkButton(
     BookmarkNode* node) {
   GtkWidget* button = gtk_chrome_button_new();
   ConfigureButtonForNode(node, button);
 
   // The tool item is also a source for dragging
@@ skipping 176 matching lines @@
   bar->ignore_button_release_ = true;
 
   BookmarkNode* node = bar->GetNodeForToolButton(button);
   DCHECK(node);
 
   bar->dragged_node_ = node;
   bar->toolbar_drop_item_ = NULL;
 
   // Build a windowed representation for our button.
   GtkWidget* window = gtk_window_new(GTK_WINDOW_POPUP);
+  gtk_widget_modify_bg(window, GTK_STATE_NORMAL, &kBackgroundColor);
   gtk_widget_realize(window);
 
   GtkWidget* frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
   gtk_container_add(GTK_CONTAINER(window), frame);
   gtk_widget_show(frame);
 
   GtkWidget* floating_button = gtk_chrome_button_new();
   bar->ConfigureButtonForNode(node, floating_button);
   gtk_container_add(GTK_CONTAINER(frame), floating_button);
@@ skipping 206 matching lines @@
   cairo_rectangle(cr, event->area.x, event->area.y,
                   event->area.width, event->area.height);
   cairo_clip(cr);
   bar->InitBackground();
   bar->background_ninebox_->RenderTopCenterStrip(cr, event->area.x,
                                                  0, event->area.width);
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }