Changes the width of pinned tabs to be slightly bigger.

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 "app/gfx/canvas_paint.h"
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 12 matching lines @@
 namespace {
 
 const int kLeftPadding = 16;
 const int kTopPadding = 6;
 const int kRightPadding = 15;
 const int kBottomPadding = 5;
 const int kFavIconTitleSpacing = 4;
 const int kTitleCloseButtonSpacing = 5;
 const int kStandardTitleWidth = 175;
 const int kDropShadowOffset = 2;
-// Value added to pinned_tab_pref_width_ to get
-// pinned_tab_renderer_as_tab_width_. See description of
-// pinned_tab_renderer_as_tab_width_ for details.
-const int kPinnedTabRendererAsNonPinnedWidth = 30;
+// Preferred width of pinned tabs.
+const int kPinnedTabWidth = 56;
+// When a non-pinned tab is pinned the width of the tab animates. If the width
+// of a pinned tab is >= kPinnedTabRendererAsTabWidth then the tab is rendered
+// as a normal tab. This is done to avoid having the title immediately
+// disappear when transitioning a tab from normal to pinned.
+const int kPinnedTabRendererAsTabWidth = kPinnedTabWidth + 30;
 
 // 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;
 
 const SkScalar kTabCapWidth = 15;
 const SkScalar kTabTopCurveWidth = 4;
 const SkScalar kTabBottomCurveWidth = 3;
@@ skipping 50 matching lines @@
 bool TabRendererGtk::initialized_ = false;
 TabRendererGtk::TabImage TabRendererGtk::tab_active_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_inactive_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_alpha = {0};
 gfx::Font* TabRendererGtk::title_font_ = NULL;
 int TabRendererGtk::title_font_height_ = 0;
 int TabRendererGtk::close_button_width_ = 0;
 int TabRendererGtk::close_button_height_ = 0;
 SkColor TabRendererGtk::selected_title_color_ = SK_ColorBLACK;
 SkColor TabRendererGtk::unselected_title_color_ = SkColorSetRGB(64, 64, 64);
-int TabRendererGtk::pinned_tab_renderer_as_tab_width_ = 0;
-int TabRendererGtk::pinned_tab_pref_width_ = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk::LoadingAnimation, public:
 //
 TabRendererGtk::LoadingAnimation::LoadingAnimation(
     ThemeProvider* theme_provider)
     : data_(new Data(theme_provider)),
       theme_provider_(theme_provider),
       animation_state_(ANIMATION_NONE),
       animation_frame_(0) {
@@ skipping 193 matching lines @@
 
 // static
 gfx::Size TabRendererGtk::GetStandardSize() {
   gfx::Size standard_size = GetMinimumUnselectedSize();
   standard_size.Enlarge(kFavIconTitleSpacing + kStandardTitleWidth, 0);
   return standard_size;
 }
 
 // static
 int TabRendererGtk::GetPinnedWidth() {
-  return pinned_tab_pref_width_;
+  return kPinnedTabWidth;
 }
 
 // static
 int TabRendererGtk::GetContentHeight() {
   // The height of the content of the Tab is the largest of the favicon,
   // the title text and the close button graphic.
   int content_height = std::max(kFavIconSize, title_font_height_);
   return std::max(content_height, close_button_height_);
 }
 
@@ skipping 11 matching lines @@
   tab_active_.r_width = tab_active_.image_r->width();
 
   tab_inactive_.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive_.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive_.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
   tab_inactive_.l_width = tab_inactive_.image_l->width();
   tab_inactive_.r_width = tab_inactive_.image_r->width();
 
   close_button_width_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->width();
   close_button_height_ = rb.GetBitmapNamed(IDR_TAB_CLOSE)->height();
-
-  pinned_tab_pref_width_ = kLeftPadding + kFavIconSize + kRightPadding;
-  pinned_tab_renderer_as_tab_width_ = pinned_tab_pref_width_ +
-      kPinnedTabRendererAsNonPinnedWidth;
 }
 
 // static
 void TabRendererGtk::SetSelectedTitleColor(SkColor color) {
   selected_title_color_ = color;
 }
 
 // static
 void TabRendererGtk::SetUnselectedTitleColor(SkColor color) {
   unselected_title_color_ = color;
@@ skipping 67 matching lines @@
     return;
 
   // See if the model changes whether the icons should be painted.
   const bool show_icon = ShouldShowIcon();
   const bool show_close_button = ShouldShowCloseBox();
   if (show_icon != showing_icon_ ||
       show_close_button != showing_close_button_)
     Layout();
 
   PaintTabBackground(canvas);
-  if (!is_pinned() || width() > pinned_tab_renderer_as_tab_width_)
+  if (!is_pinned() || width() > kPinnedTabRendererAsTabWidth)
     PaintTitle(canvas);
 
   if (show_icon)
     PaintIcon(canvas);
 }
 
 SkBitmap TabRendererGtk::PaintBitmap() {
   gfx::Canvas canvas(width(), height(), false);
   Paint(&canvas);
   return canvas.ExtractBitmap();
@@ skipping 15 matching lines @@
 
   // Figure out who is tallest.
   int content_height = GetContentHeight();
 
   // Size the Favicon.
   showing_icon_ = ShouldShowIcon();
   if (showing_icon_) {
     int favicon_top = kTopPadding + (content_height - kFavIconSize) / 2;
     favicon_bounds_.SetRect(local_bounds.x(), favicon_top,
                             kFavIconSize, kFavIconSize);
+    if (is_pinned() && bounds_.width() < kPinnedTabRendererAsTabWidth)
+      favicon_bounds_.set_x((bounds_.width() - kFavIconSize) / 2);
   } else {
     favicon_bounds_.SetRect(local_bounds.x(), local_bounds.y(), 0, 0);
   }
 
   // Size the Close button.
   showing_close_button_ = ShouldShowCloseBox();
   if (showing_close_button_) {
     int close_button_top =
         kTopPadding + kCloseButtonVertFuzz +
         (content_height - close_button_height_) / 2;
     close_button_bounds_.SetRect(local_bounds.width() + kCloseButtonHorzFuzz,
                                  close_button_top, close_button_width_,
                                  close_button_height_);
   } else {
     close_button_bounds_.SetRect(0, 0, 0, 0);
   }
 
-  if (!is_pinned() || width() >= pinned_tab_renderer_as_tab_width_) {
+  if (!is_pinned() || width() >= kPinnedTabRendererAsTabWidth) {
     // Size the Title text to fill the remaining space.
     int title_left = favicon_bounds_.right() + kFavIconTitleSpacing;
     int title_top = kTopPadding + (content_height - title_font_height_) / 2;
 
     // If the user has big fonts, the title will appear rendered too far down
     // on the y-axis if we use the regular top padding, so we need to adjust it
     // so that the text appears centered.
     gfx::Size minimum_size = GetMinimumUnselectedSize();
     int text_height = title_top + title_font_height_ + kBottomPadding;
     if (text_height > minimum_size.height())
@@ skipping 312 matching lines @@
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // Force the font size to 10pt.
   gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 10));
   title_font_height_ = title_font_->height();
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }