GTK Themes: Fixes button state on pressed back/forward buttons and toolbar items.

chrome/browser/gtk/custom_button.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/custom_button.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "base/gfx/gtk_util.h"
+#include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/common/notification_service.h"
 #include "grit/theme_resources.h"
 
 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider,
     int normal_id, int active_id, int highlight_id, int depressed_id)
     : paint_override_(-1),
       normal_id_(normal_id),
       active_id_(active_id),
       highlight_id_(highlight_id),
@@ skipping 65 matching lines @@
   pixbufs_[GTK_STATE_PRELIGHT] = highlight_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(highlight_id_) : NULL;
   pixbufs_[GTK_STATE_SELECTED] = NULL;
   pixbufs_[GTK_STATE_INSENSITIVE] = depressed_id_ ?
       theme_provider_->GetRTLEnabledPixbufNamed(depressed_id_) : NULL;
 }
 
 CustomDrawButton::CustomDrawButton(int normal_id, int active_id,
     int highlight_id, int depressed_id, const char* stock_id)
     : button_base_(NULL, normal_id, active_id, highlight_id, depressed_id),
-      gtk_stock_name_(stock_id),
-      has_expose_signal_handler_(false) {
+      theme_provider_(NULL),
+      gtk_stock_name_(stock_id) {
   Init();
 
   // Initialize the theme stuff with no theme_provider.
   SetBrowserTheme(NULL);
 }
 
 CustomDrawButton::CustomDrawButton(GtkThemeProvider* theme_provider,
     int normal_id, int active_id, int highlight_id, int depressed_id,
     const char* stock_id)
     : button_base_(theme_provider, normal_id, active_id, highlight_id,
                    depressed_id),
-      gtk_stock_name_(stock_id),
-      has_expose_signal_handler_(false) {
+      theme_provider_(theme_provider),
+      gtk_stock_name_(stock_id) {
   Init();
 
   theme_provider->InitThemesFor(this);
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
 }
 
 CustomDrawButton::~CustomDrawButton() {
   widget_.Destroy();
 }
 
 void CustomDrawButton::Init() {
-  widget_.Own(gtk_button_new());
+  widget_.Own(gtk_chrome_button_new());
   GTK_WIDGET_UNSET_FLAGS(widget_.get(), GTK_CAN_FOCUS);
+  g_signal_connect(G_OBJECT(widget_.get()), "expose-event",
+                   G_CALLBACK(OnCustomExpose), this);
 }
 
 void CustomDrawButton::Observe(NotificationType type,
     const NotificationSource& source, const NotificationDetails& details) {
   DCHECK(NotificationType::BROWSER_THEME_CHANGED == type);
 
   GtkThemeProvider* provider = static_cast<GtkThemeProvider*>(
       Source<GtkThemeProvider>(source).ptr());
   SetBrowserTheme(provider);
 }
 
 void CustomDrawButton::SetPaintOverride(GtkStateType state) {
   button_base_.set_paint_override(state);
+  gtk_chrome_button_set_paint_state(GTK_CHROME_BUTTON(widget_.get()), state);
   gtk_widget_queue_draw(widget_.get());
 }
 
 void CustomDrawButton::UnsetPaintOverride() {
   button_base_.set_paint_override(-1);
+  gtk_chrome_button_unset_paint_state(GTK_CHROME_BUTTON(widget_.get()));
   gtk_widget_queue_draw(widget_.get());
 }
 
 // static
 gboolean CustomDrawButton::OnCustomExpose(GtkWidget* widget,
                                           GdkEventExpose* e,
                                           CustomDrawButton* button) {
-  return button->button_base_.OnExpose(widget, e);
+  if (button->theme_provider_ && button->theme_provider_->UseGtkTheme() ) {
+    // Continue processing this expose event.
+    return FALSE;
+  } else {
+    return button->button_base_.OnExpose(widget, e);
+  }
 }
 
 // static
 CustomDrawButton* CustomDrawButton::CloseButton() {
   CustomDrawButton* button =
       new CustomDrawButton(IDR_CLOSE_BAR, IDR_CLOSE_BAR_P,
                            IDR_CLOSE_BAR_H, 0, NULL);
   return button;
 }
 
 void CustomDrawButton::SetBrowserTheme(GtkThemeProvider* theme_provider) {
-  if (theme_provider && theme_provider->UseGtkTheme() && gtk_stock_name_) {
+  bool use_gtk = theme_provider && theme_provider->UseGtkTheme();
+
+  if (use_gtk && gtk_stock_name_) {
     gtk_button_set_image(
         GTK_BUTTON(widget_.get()),
         gtk_image_new_from_stock(gtk_stock_name_, GTK_ICON_SIZE_BUTTON));
     gtk_widget_set_size_request(widget_.get(), -1, -1);
     gtk_widget_set_app_paintable(widget_.get(), FALSE);
     gtk_widget_set_double_buffered(widget_.get(), TRUE);
-
-    if (has_expose_signal_handler_)
-      gtk_signal_disconnect_by_data(GTK_OBJECT(widget_.get()), this);
-    has_expose_signal_handler_ = false;
   } else {
     gtk_widget_set_size_request(widget_.get(),
                                 gdk_pixbuf_get_width(button_base_.pixbufs(0)),
                                 gdk_pixbuf_get_height(button_base_.pixbufs(0)));
 
     gtk_widget_set_app_paintable(widget_.get(), TRUE);
     // We effectively double-buffer by virtue of having only one image...
     gtk_widget_set_double_buffered(widget_.get(), FALSE);
-    g_signal_connect(G_OBJECT(widget_.get()), "expose-event",
-                     G_CALLBACK(OnCustomExpose), this);
-    has_expose_signal_handler_ = true;
   }
+
+  gtk_chrome_button_set_use_gtk_rendering(
+      GTK_CHROME_BUTTON(widget_.get()), use_gtk);
 }