GTK: Fix highlight and image colors in the new wrench menu.

chrome/browser/gtk/gtk_custom_menu_item.cc

 // Copyright (c) 2010 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_custom_menu_item.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "chrome/browser/gtk/gtk_custom_menu.h"
 
 enum {
   BUTTON_PUSHED,
   LAST_SIGNAL
 };
 
 static guint custom_menu_item_signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE(GtkCustomMenuItem, gtk_custom_menu_item, GTK_TYPE_MENU_ITEM)
 
 static void set_selected(GtkCustomMenuItem* item, GtkWidget* selected) {
   if (selected != item->currently_selected_button) {
-    if (item->currently_selected_button)
+    if (item->currently_selected_button) {
       gtk_widget_set_state(item->currently_selected_button, GTK_STATE_NORMAL);
+      gtk_widget_set_state(
+          gtk_bin_get_child(GTK_BIN(item->currently_selected_button)),
+          GTK_STATE_NORMAL);
+    }
 
     item->currently_selected_button = selected;
-    if (item->currently_selected_button)
+    if (item->currently_selected_button) {
       gtk_widget_set_state(item->currently_selected_button, GTK_STATE_SELECTED);
+      gtk_widget_set_state(
+          gtk_bin_get_child(GTK_BIN(item->currently_selected_button)),
+          GTK_STATE_PRELIGHT);
+    }
   }
 }
 
 // When GtkButtons set the label text, they rebuild the widget hierarchy each
 // and every time. Therefore, we can't just fish out the label from the button
 // and set some properties; we have to create this callback function that
 // listens on the button's "notify" signal, which is emitted right after the
 // label has been (re)created. (Label values can change dynamically.)
 static void on_button_label_set(GObject* object) {
   GtkButton* button = GTK_BUTTON(object);
   gtk_widget_set_sensitive(GTK_BIN(button)->child, FALSE);
   gtk_misc_set_padding(GTK_MISC(GTK_BIN(button)->child), 2, 0);
 }
 
 static void gtk_custom_menu_item_finalize(GObject *object);
 static gint gtk_custom_menu_item_expose(GtkWidget* widget,
                                         GdkEventExpose* event);
 static gboolean gtk_custom_menu_item_hbox_expose(GtkWidget* widget,
                                                  GdkEventExpose* event,
                                                  GtkCustomMenuItem* menu_item);
 static void gtk_custom_menu_item_select(GtkItem *item);
 static void gtk_custom_menu_item_deselect(GtkItem *item);
 static void gtk_custom_menu_item_activate(GtkMenuItem* menu_item);
 
-static void gtk_custom_menu_item_style_set(GtkCustomMenuItem* item,
-                                           GtkStyle* old_style) {
-  // Because several popular themes have no idea about styling buttons in menus
-  // (it's sort of a weird concept) and look like crap, we manually apply the
-  // menu item's prelight information to the button.
-  GtkStyle* style = gtk_widget_get_style(GTK_WIDGET(item));
-
-  for (GList* i = item->button_widgets; i; i = g_list_next(i)) {
-    // Set the button prelight colors.
-    GtkWidget* button = GTK_WIDGET(i->data);
-    gtk_widget_modify_fg(button, GTK_STATE_PRELIGHT,
-                         &style->fg[GTK_STATE_PRELIGHT]);
-    gtk_widget_modify_bg(button, GTK_STATE_PRELIGHT,
-                         &style->bg[GTK_STATE_PRELIGHT]);
-    gtk_widget_modify_text(button, GTK_STATE_PRELIGHT,
-                           &style->text[GTK_STATE_PRELIGHT]);
-    gtk_widget_modify_base(button, GTK_STATE_PRELIGHT,
-                           &style->base[GTK_STATE_PRELIGHT]);
-  }
-}
-
 static void gtk_custom_menu_item_init(GtkCustomMenuItem* item) {
   item->all_widgets = NULL;
   item->button_widgets = NULL;
   item->currently_selected_button = NULL;
   item->previously_selected_button = NULL;
 
   GtkWidget* menu_hbox = gtk_hbox_new(FALSE, 0);
   gtk_container_add(GTK_CONTAINER(item), menu_hbox);
 
   item->label = gtk_label_new(NULL);
   gtk_misc_set_alignment(GTK_MISC(item->label), 0.0, 0.5);
   gtk_box_pack_start(GTK_BOX(menu_hbox), item->label, TRUE, TRUE, 0);
 
   item->hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(menu_hbox), item->hbox, FALSE, FALSE, 0);
 
-  g_signal_connect(item, "style-set",
-                   G_CALLBACK(gtk_custom_menu_item_style_set), NULL);
-
   g_signal_connect(item->hbox, "expose-event",
                    G_CALLBACK(gtk_custom_menu_item_hbox_expose),
                    item);
 
   gtk_widget_show_all(menu_hbox);
 }
 
 static void gtk_custom_menu_item_class_init(GtkCustomMenuItemClass* klass) {
   GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
   GtkWidgetClass* widget_class = GTK_WIDGET_CLASS(klass);
@@ skipping 200 matching lines @@
 
   return button;
 }
 
 GtkWidget* gtk_custom_menu_item_add_button_label(GtkCustomMenuItem* menu_item,
                                                  int command_id) {
   GtkWidget* button = gtk_button_new_with_label("");
   g_object_set_data(G_OBJECT(button), "command-id",
                     GINT_TO_POINTER(command_id));
   gtk_box_pack_start(GTK_BOX(menu_item->hbox), button, FALSE, FALSE, 0);
-  g_signal_connect(button, "notify", G_CALLBACK(on_button_label_set), NULL);
+  g_signal_connect(button, "notify::label",
+                   G_CALLBACK(on_button_label_set), NULL);
   gtk_widget_show(button);
 
   menu_item->all_widgets = g_list_append(menu_item->all_widgets, button);
 
   return button;
 }
 
 void gtk_custom_menu_item_add_space(GtkCustomMenuItem* menu_item) {
   GtkWidget* fixed = gtk_fixed_new();
   gtk_widget_set_size_request(fixed, 5, -1);
@@ skipping 80 matching lines @@
     }
   }
 
   gtk_widget_queue_draw(GTK_WIDGET(menu_item));
 }
 
 gboolean gtk_custom_menu_item_is_in_clickable_region(
     GtkCustomMenuItem* menu_item) {
   return menu_item->currently_selected_button != NULL;
 }