gtk: Move the enter/leave-notify-event handling to TabRendererGtk and hook up...

chrome/browser/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/favicon_size.h"
@@ skipping 787 matching lines @@
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
   CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
       IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
 
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnCloseButtonClicked), this);
   g_signal_connect(G_OBJECT(button->widget()), "button-release-event",
                    G_CALLBACK(OnCloseButtonMouseRelease), this);
+  g_signal_connect(G_OBJECT(button->widget()), "enter-notify-event",
+                   G_CALLBACK(OnEnterNotifyEvent), this);
+  g_signal_connect(G_OBJECT(button->widget()), "leave-notify-event",
+                   G_CALLBACK(OnLeaveNotifyEvent), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
   gtk_fixed_put(GTK_FIXED(tab_.get()), button->widget(), 0, 0);
 
   return button;
 }
 
 void TabRendererGtk::CloseButtonClicked() {
   // Nothing to do.
 }
 
@@ skipping 33 matching lines @@
 
   // Nothing to do if the bounds are the same.  If we don't catch this, we'll
   // get an infinite loop of size-allocate signals.
   if (tab->bounds_ == bounds)
     return;
 
   tab->bounds_ = bounds;
   tab->Layout();
 }
 
-void TabRendererGtk::OnMouseEntered() {
-  hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
-  hover_animation_->Show();
-}
-
-void TabRendererGtk::OnMouseExited() {
-  hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
-  hover_animation_->Hide();
+// static
+gboolean TabRendererGtk::OnEnterNotifyEvent(GtkWidget* widget,
+                                            GdkEventCrossing* event,

[Elliot Glaysher, 2009/08/03 03:30:29]

Spacing?

[James Hawkins, 2009/08/03 03:40:16]

I'm not sure what you're pointing out.  Little help?

[Elliot Glaysher, 2009/08/03 03:41:46]

"GdkEventCrossing* event," and "TabRenderGtk* tab) {" should have one additional
space; they aren't lined up with the '(' character. Same with
OnLeaveNotifyEvent.

[James Hawkins, 2009/08/03 03:45:02]

In my editor and this CL, The G's in GtkWidget and GdkEventCrossing line up
(same for the T of TabRendererGtk).  We're seeing something different?

[Elliot Glaysher, 2009/08/03 18:39:40]

Build of Chromium Linux from Friday: Off by one space

Windows Chromium; Linux Firefox: Spacing looks OK.

Really weird. LGTM.

+                                            TabRendererGtk* tab) {
+  tab->hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
+  tab->hover_animation_->Show();
+  return FALSE;
 }
 
 // static
+gboolean TabRendererGtk::OnLeaveNotifyEvent(GtkWidget* widget,
+                                            GdkEventCrossing* event,
+                                            TabRendererGtk* tab) {
+  tab->hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
+  tab->hover_animation_->Hide();
+  return FALSE;
+}
+
+// static
 void TabRendererGtk::InitResources() {
   if (initialized_)
     return;
 
   LoadTabImages();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // Force the font size to 8pt.
   gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 8));
   title_font_height_ = title_font_->height();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }