Linux/Gtk: Drawing a focus-ring around the avatar menu items to highlight selection.

chrome/browser/ui/gtk/avatar_menu_item_gtk.cc

 // Copyright (c) 2011 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/ui/gtk/avatar_menu_item_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 102 matching lines @@
   gtk_widget_hide(link_alignment_);
 }
 
 void AvatarMenuItemGtk::ShowEditLink() {
   gtk_widget_hide(status_label_);
   gtk_widget_show(link_alignment_);
 }
 
 gboolean AvatarMenuItemGtk::OnProfileFocusIn(GtkWidget* widget,
                                              GdkEventFocus* event) {
-  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, &highlighted_color_);
   if (item_.active)
     ShowEditLink();
 
   return FALSE;
 }
 
 gboolean AvatarMenuItemGtk::OnProfileFocusOut(GtkWidget* widget,
                                               GdkEventFocus* event) {
-  gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, unhighlighted_color_);
   if (item_.active)
     ShowStatusLabel();
 
   return FALSE;
 }
 
 gboolean AvatarMenuItemGtk::OnProfileEnter(GtkWidget* widget,
                                            GdkEventCrossing* event) {
   if (event->detail == GDK_NOTIFY_INFERIOR)
     return FALSE;
@@ skipping 51 matching lines @@
   // delegate_->EditProfile() will close the avatar bubble which in turn
   // try to destroy this AvatarMenuItemGtk.
   // This is not OK to do this from the signal handler, so we'll
   // defer it.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AvatarMenuItemGtk::EditProfile,
                  weak_factory_.GetWeakPtr()));
 }
 
+gboolean AvatarMenuItemGtk::OnEventBoxExpose(GtkWidget* widget,
+                                             GdkEventExpose* event) {
+  // Draw the focus rectangle.
+  if (gtk_widget_has_focus(widget)) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);

[Elliot Glaysher, 2011/12/12 20:48:24]

Thank you for getting this right.

(Sadly, there's still way too many GSEALs to fix up still...)

+    gtk_paint_focus(widget->style, widget->window,
+                    gtk_widget_get_state(widget),
+                    &event->area, widget, NULL,
+                    0, 0,
+                    allocation.width, allocation.height);
+  }
+
+  return TRUE;
+}
+
 void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
   widget_.Own(gtk_event_box_new());
 
   g_signal_connect(widget_.get(), "button-press-event",
       G_CALLBACK(OnProfileClickThunk), this);
   g_signal_connect(widget_.get(), "enter-notify-event",
       G_CALLBACK(OnProfileEnterThunk), this);
   g_signal_connect(widget_.get(), "leave-notify-event",
       G_CALLBACK(OnProfileLeaveThunk), this);
   g_signal_connect(widget_.get(), "focus-in-event",
       G_CALLBACK(OnProfileFocusInThunk), this);
   g_signal_connect(widget_.get(), "focus-out-event",
       G_CALLBACK(OnProfileFocusOutThunk), this);
   g_signal_connect(widget_.get(), "key-press-event",
       G_CALLBACK(OnProfileKeyPressThunk), this);
+  g_signal_connect_after(widget_.get(), "expose-event",
+      G_CALLBACK(OnEventBoxExposeThunk), this);
 
   GtkWidget* item_hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
   GdkPixbuf* avatar_pixbuf = NULL;
 
   // If this profile is active then draw a check mark on the bottom right
   // of the profile icon.
   if (item_.active) {
     const SkBitmap* avatar_image = item_.icon.ToSkBitmap();
     gfx::CanvasSkia canvas(avatar_image->width(),
                            avatar_image->height(),
@@ skipping 66 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }