Multi-tab selection for Linux.

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 331 matching lines @@
   if (data_.blocked == blocked)
     return;
   data_.blocked = blocked;
   // TODO(zelidrag) bug 32399: Make tabs pulse on Linux as well.
 }
 
 bool TabRendererGtk::is_blocked() const {
   return data_.blocked;
 }
 
+bool TabRendererGtk::IsActive() const {
+  return true;
+}
+
 bool TabRendererGtk::IsSelected() const {
   return true;
 }
 
 bool TabRendererGtk::IsVisible() const {
   return GTK_WIDGET_FLAGS(tab_.get()) & GTK_VISIBLE;
 }
 
 void TabRendererGtk::SetVisible(bool visible) const {
   if (visible) {
@@ skipping 21 matching lines @@
   event->area.height = favicon_bounds_.height();
   gfx::CanvasSkiaPaint canvas(event, false);
 
   // The actual paint methods expect 0, 0 to be the tab top left (see
   // PaintTab).
   canvas.TranslateInt(x(), y());
 
   // Paint the background behind the favicon.
   int theme_id;
   int offset_y = 0;
-  if (IsSelected()) {
+  if (IsActive()) {
     theme_id = IDR_THEME_TOOLBAR;
   } else {
     if (!data_.incognito) {
       theme_id = IDR_THEME_TAB_BACKGROUND;
     } else {
       theme_id = IDR_THEME_TAB_BACKGROUND_INCOGNITO;
     }
     if (!theme_service_->HasCustomImage(theme_id))
       offset_y = background_offset_y_;
   }
   SkBitmap* tab_bg = theme_service_->GetBitmapNamed(theme_id);
   canvas.TileImageInt(*tab_bg,
       x() + favicon_bounds_.x(), offset_y + favicon_bounds_.y(),
       favicon_bounds_.x(), favicon_bounds_.y(),
       favicon_bounds_.width(), favicon_bounds_.height());
 
-  if (!IsSelected()) {
+  if (!IsActive()) {
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
       SkRect bounds;
       bounds.set(favicon_bounds_.x(), favicon_bounds_.y(),
           favicon_bounds_.right(), favicon_bounds_.bottom());
       canvas.saveLayerAlpha(&bounds, static_cast<int>(throb_value * 0xff),
                             SkCanvas::kARGB_ClipLayer_SaveFlag);
       canvas.drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
       SkBitmap* active_bg = theme_service_->GetBitmapNamed(IDR_THEME_TOOLBAR);
       canvas.TileImageInt(*active_bg,
           x() + favicon_bounds_.x(), favicon_bounds_.y(),
           favicon_bounds_.x(), favicon_bounds_.y(),
           favicon_bounds_.width(), favicon_bounds_.height());
       canvas.restore();
     }
   }
 
   // Now paint the icon.
   PaintIcon(&canvas);
 }
 
 bool TabRendererGtk::ShouldShowIcon() const {
   if (mini() && height() >= GetMinimumUnselectedSize().height()) {
     return true;
   } else if (!data_.show_icon) {
     return false;
-  } else if (IsSelected()) {
+  } else if (IsActive()) {
     // The selected tab clips favicon before close button.
     return IconCapacity() >= 2;
   }
   // Non-selected tabs clip close button before favicon.
   return IconCapacity() >= 1;
 }
 
 // static
 gfx::Size TabRendererGtk::GetMinimumUnselectedSize() {
   InitResources();
@@ skipping 366 matching lines @@
   // Paint the Title.
   string16 title = data_.title;
   if (title.empty()) {
     title = data_.loading ?
         l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE) :
         TabContentsWrapper::GetDefaultTitle();
   } else {
     Browser::FormatTitleForDisplay(&title);
   }
 
-  SkColor title_color = IsSelected() ? selected_title_color_
+  SkColor title_color = IsActive() ? selected_title_color_
                                      : unselected_title_color_;
   canvas->DrawStringInt(title, *title_font_, title_color,
                         title_bounds_.x(), title_bounds_.y(),
                         title_bounds_.width(), title_bounds_.height());
 }
 
 void TabRendererGtk::PaintIcon(gfx::Canvas* canvas) {
   if (loading_animation_.animation_state() != ANIMATION_NONE) {
     PaintLoadingAnimation(canvas);
   } else {
@@ skipping 36 matching lines @@
                                 kFaviconSize + faviconHeightDelta,
                                 true);
         }
       }
     }
     canvas->Restore();
   }
 }
 
 void TabRendererGtk::PaintTabBackground(gfx::Canvas* canvas) {
-  if (IsSelected()) {
+  if (IsActive()) {
     PaintActiveTabBackground(canvas);
   } else {
     PaintInactiveTabBackground(canvas);
 
     double throb_value = GetThrobValue();
     if (throb_value > 0) {
       canvas->SaveLayerAlpha(static_cast<int>(throb_value * 0xff),
                              gfx::Rect(width(), height()));
       canvas->AsCanvasSkia()->drawARGB(0, 255, 255, 255,
                                        SkXfermode::kClear_Mode);
       PaintActiveTabBackground(canvas);
       canvas->Restore();
     }
   }
 }
 
 void TabRendererGtk::PaintInactiveTabBackground(gfx::Canvas* canvas) {
 
   // The tab image needs to be lined up with the background image
   // so that it feels partially transparent.
   int offset_x = background_offset_x_;
 
   int tab_id = data_.incognito ?
       IDR_THEME_TAB_BACKGROUND_INCOGNITO : IDR_THEME_TAB_BACKGROUND;
+  if (IsSelected())
+    tab_id = IDR_THEME_TAB_BACKGROUND_V;

[James Hawkins, 2011/05/12 21:59:52]

Does this also work for incognito windows?

[dpapad, 2011/05/12 22:31:38]

It seems to me that a new theme should be added for not active, selected
incognito tabs in theme_service.cc, probably called
IDR_THEME_TAB_BACKGROUND_INCOGNITO_V and then this if statement should be
slightly modified. For the moment any not active, selected tabs use the same
theme.

I will ask rsesek and sky about the themes.

 
   SkBitmap* tab_bg = theme_service_->GetBitmapNamed(tab_id);
 
   // 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(tab_id) ?
       0 : background_offset_y_;
 
   // Draw left edge.
@@ skipping 68 matching lines @@
 }
 
 int TabRendererGtk::IconCapacity() const {
   if (height() < GetMinimumUnselectedSize().height())
     return 0;
   return (width() - kLeftPadding - kRightPadding) / kFaviconSize;
 }
 
 bool TabRendererGtk::ShouldShowCloseBox() const {
   // The selected tab never clips close button.
-  return !mini() && (IsSelected() || IconCapacity() >= 3);
+  return !mini() && (IsActive() || IconCapacity() >= 3);
 }
 
 CustomDrawButton* TabRendererGtk::MakeCloseButton() {
   CustomDrawButton* button = new CustomDrawButton(IDR_TAB_CLOSE,
       IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE);
 
   gtk_widget_set_tooltip_text(button->widget(),
       l10n_util::GetStringUTF8(IDS_TOOLTIP_CLOSE_TAB).c_str());
 
   g_signal_connect(button->widget(), "clicked",
@@ skipping 82 matching lines @@
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   crashed_favicon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }