Scroll-wheeling, whilst over the tab-strip, now switches tabs on GTK/Linux.

chrome/browser/gtk/browser_titlebar.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/browser_titlebar.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "app/l10n_util.h"
+#include "base/gfx/gtk_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/app_resources.h"
@@ skipping 46 matching lines @@
 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
                                  GtkWindow* window)
     : browser_window_(browser_window), window_(window),
       using_custom_frame_(false) {
   Init();
 }
 
 void BrowserTitlebar::Init() {
   // The widget hierarchy is shown below.
   //
-  // +- HBox (container_) -----------------------------------------------------+
+  // +- EventBox (container_) -------------------------------------------------+
+  // +- HBox (container_hbox) -------------------------------------------------+
   // |+- Algn. -++- Alignment --------------++- VBox (titlebar_buttons_box_) -+|
   // ||+ Image +||   (titlebar_alignment_)  ||+- HBox -----------------------+||
   // |||spy_guy|||                          |||+- button -++- button -+      |||
   // |||       |||+- TabStripGtk  ---------+|||| minimize || restore  | ...  |||
   // |||  )8\  |||| tab   tab   tabclose   ||||+----------++----------+      |||
   // ||+-------+||+------------------------+||+------------------------------+||
   // |+---------++--------------------------++--------------------------------+|
   // +-------------------------------------------------------------------------+
-  container_ = gtk_hbox_new(FALSE, 0);
+  GtkWidget* container_hbox = gtk_hbox_new(FALSE, 0);
+
+  container_ = gtk_event_box_new();
+  gtk_event_box_set_visible_window(GTK_EVENT_BOX(container_), FALSE);
+  gtk_container_add(GTK_CONTAINER(container_), container_hbox);
+
+  g_signal_connect(G_OBJECT(container_), "scroll-event",
+                   G_CALLBACK(OnScroll), this);
 
   g_signal_connect(window_, "window-state-event",
                    G_CALLBACK(OnWindowStateChanged), this);
 
   if (browser_window_->browser()->profile()->IsOffTheRecord()) {
     GtkWidget* spy_guy = gtk_image_new_from_pixbuf(GetOTRAvatar());
     gtk_misc_set_alignment(GTK_MISC(spy_guy), 0.0, 1.0);
     GtkWidget* spy_frame = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
     // We use this alignment rather than setting padding on the GtkImage because
     // the image's intrinsic padding doesn't clip the pixbuf during painting.
     gtk_alignment_set_padding(GTK_ALIGNMENT(spy_frame), kOTRMaximizedTopSpacing,
         kOTRBottomSpacing, kOTRSideSpacing, kOTRSideSpacing);
     gtk_widget_set_size_request(spy_guy, -1, 0);
     gtk_container_add(GTK_CONTAINER(spy_frame), spy_guy);
-    gtk_box_pack_start(GTK_BOX(container_), spy_frame, FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(container_hbox), spy_frame, FALSE, FALSE, 0);
   }
 
   // We use an alignment to control the titlebar height.
   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_box_pack_start(GTK_BOX(container_), titlebar_alignment_, TRUE,
+  gtk_box_pack_start(GTK_BOX(container_hbox), titlebar_alignment_, TRUE,
                      TRUE, 0);
 
   // Put the tab strip in the titlebar.
   gtk_container_add(GTK_CONTAINER(titlebar_alignment_),
                     browser_window_->tabstrip()->widget());
 
   // We put the min/max/restore/close buttons in a vbox so they are top aligned
   // and don't vertically stretch.
   titlebar_buttons_box_ = gtk_vbox_new(FALSE, 0);
   GtkWidget* buttons_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(titlebar_buttons_box_), buttons_hbox, FALSE,
                      FALSE, 0);
 
   close_button_.reset(BuildTitlebarButton(IDR_CLOSE, IDR_CLOSE_P, IDR_CLOSE_H,
                       buttons_hbox, IDS_XPFRAME_CLOSE_TOOLTIP));
   restore_button_.reset(BuildTitlebarButton(IDR_RESTORE, IDR_RESTORE_P,
                         IDR_RESTORE_H, buttons_hbox,
                         IDS_XPFRAME_RESTORE_TOOLTIP));
   maximize_button_.reset(BuildTitlebarButton(IDR_MAXIMIZE, IDR_MAXIMIZE_P,
                          IDR_MAXIMIZE_H, buttons_hbox,
                          IDS_XPFRAME_MAXIMIZE_TOOLTIP));
   minimize_button_.reset(BuildTitlebarButton(IDR_MINIMIZE, IDR_MINIMIZE_P,
                          IDR_MINIMIZE_H, buttons_hbox,
                          IDS_XPFRAME_MINIMIZE_TOOLTIP));
 
   GtkRequisition req;
   gtk_widget_size_request(close_button_->widget(), &req);
   close_button_default_width_ = req.width;
 
-  gtk_box_pack_end(GTK_BOX(container_), titlebar_buttons_box_, FALSE,
+  gtk_box_pack_end(GTK_BOX(container_hbox), titlebar_buttons_box_, FALSE,
                    FALSE, 0);
 
   gtk_widget_show_all(container_);
 }
 
 CustomDrawButton* BrowserTitlebar::BuildTitlebarButton(int image,
     int image_pressed, int image_hot, GtkWidget* box, int tooltip) {
   CustomDrawButton* button = new CustomDrawButton(image, image_pressed,
       image_hot, 0);
   gtk_widget_add_events(GTK_WIDGET(button->widget()), GDK_POINTER_MOTION_MASK);
@@ skipping 40 matching lines @@
     gtk_widget_show(titlebar->restore_button_->widget());
   } else {
     gtk_widget_hide(titlebar->restore_button_->widget());
     gtk_widget_show(titlebar->maximize_button_->widget());
   }
   titlebar->UpdateTitlebarAlignment();
   return FALSE;
 }
 
 // static
+gboolean BrowserTitlebar::OnScroll(GtkWidget* widget, GdkEventScroll* event,
+                                   BrowserTitlebar* titlebar) {
+  TabStripModel* tabstrip_model =
+      titlebar->browser_window_->browser()->tabstrip_model();
+  if (event->direction == GDK_SCROLL_LEFT ||
+      event->direction == GDK_SCROLL_UP) {
+    tabstrip_model->SelectPreviousTab();
+  } else {
+    tabstrip_model->SelectNextTab();
+  }
+  return TRUE;
+}
+
+// static
 void BrowserTitlebar::OnButtonClicked(GtkWidget* button,
                                       BrowserTitlebar* titlebar) {
   if (titlebar->close_button_->widget() == button) {
     titlebar->browser_window_->Close();
   } else if (titlebar->restore_button_->widget() == button) {
     gtk_window_unmaximize(titlebar->window_);
   } else if (titlebar->maximize_button_->widget() == button) {
     gtk_window_maximize(titlebar->window_);
   } else if (titlebar->minimize_button_->widget() == button) {
     gtk_window_iconify(titlebar->window_);
@@ skipping 63 matching lines @@
       PrefService* prefs = browser_window_->browser()->profile()->GetPrefs();
       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
                         !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
       break;
     }
 
     default:
       NOTREACHED();
   }
 }