GTK: Make the drawing of selected tabs use the throb value.

chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/utf_string_conversions.h"
@@ skipping 56 matching lines @@
 // don't actually overlap the toolbar, so this is used to know how many pixels
 // at the bottom of the tab images are to be ignored.
 const int kToolbarOverlap = 1;
 
 // How long the hover state takes.
 const int kHoverDurationMs = 90;
 
 // How opaque to make the hover state (out of 1).
 const double kHoverOpacity = 0.33;
 
+// Opacity for non-active selected tabs.
+const double kSelectedTabOpacity = .45;

[dpapad, 2011/10/31 20:29:34]

nit: s/.45/0.45 for consistency within this file.

+
+// Selected (but not active) tabs have their throb value scaled down by this.
+const double kSelectedTabThrobScale = .5;

[dpapad, 2011/10/31 20:29:34]

nit: same here.

+
 // Max opacity for the mini-tab title change animation.
 const double kMiniTitleChangeThrobOpacity = 0.75;
 
 // Duration for when the title of an inactive mini-tab changes.
 const int kMiniTitleChangeThrobDuration = 1000;
 
 // The vertical and horizontal offset used to position the close button
 // in the tab. TODO(jhawkins): Ask pkasting what the Fuzz is about.
 const int kCloseButtonVertFuzz = 0;
 const int kCloseButtonHorzFuzz = 5;
@@ skipping 851 matching lines @@
   CairoCachedSurface* active_image_r =
       theme_service_->GetSurfaceNamed(right_idr, widget);
   active_image_r->SetSource(cr, width() - active_image_r->Width(), 0);
   cairo_paint(cr);
 }
 
 void TabRendererGtk::PaintInactiveTabBackground(GtkWidget* widget,
                                                      cairo_t* cr) {
   int theme_id = data_.incognito ?
       IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND;
-  if (IsSelected())
-    theme_id = IDR_THEME_TAB_BACKGROUND_V;
 
   CairoCachedSurface* tab_bg =
       theme_service_->GetSurfaceNamed(theme_id, widget);
 
   // If the theme is providing a custom background image, then its top edge
   // should be at the top of the tab. Otherwise, we assume that the background
   // image is a composited foreground + frame image.
   int offset_y = theme_service_->HasCustomImage(theme_id) ?
       0 : background_offset_y_;
 
@@ skipping 57 matching lines @@
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(button->widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
   gtk_widget_set_can_focus(button->widget(), FALSE);
   gtk_fixed_put(GTK_FIXED(tab_.get()), button->widget(), 0, 0);
 
   return button;
 }
 
 double TabRendererGtk::GetThrobValue() {
+  bool is_selected = IsSelected();
+  double min = is_selected ? kSelectedTabOpacity : 0;
+  double scale = is_selected ? kSelectedTabThrobScale : 1;
+
   if (mini_title_animation_.get() && mini_title_animation_->is_animating()) {
     return mini_title_animation_->GetCurrentValue() *
-        kMiniTitleChangeThrobOpacity;
+        kMiniTitleChangeThrobOpacity * scale + min;
   }
-  return hover_animation_.get() ?
-      kHoverOpacity * hover_animation_->GetCurrentValue() : 0;
+
+  if (hover_animation_.get())
+    return kHoverOpacity * hover_animation_->GetCurrentValue() * scale + min;
+
+  return is_selected ? kSelectedTabOpacity : 0;
 }
 
 void TabRendererGtk::CloseButtonClicked() {
   // Nothing to do.
 }
 
 void TabRendererGtk::OnCloseButtonClicked(GtkWidget* widget) {
   CloseButtonClicked();
 }
 
@@ skipping 59 matching lines @@
 
   close_button_width_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->width();
   close_button_height_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->height();
 
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   initialized_ = true;
 }