summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/app_base.gypi2
-rw-r--r--app/gfx/canvas.cc8
-rw-r--r--app/gfx/canvas.h2
-rw-r--r--app/gfx/skia_util.cc (renamed from skia/ext/skia_utils.cc)24
-rw-r--r--app/gfx/skia_util.h (renamed from skia/ext/skia_utils.h)19
-rw-r--r--chrome/browser/ntp_background_util.cc2
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc4
-rw-r--r--chrome/browser/views/detachable_toolbar_view.cc18
-rw-r--r--chrome/browser/views/frame/browser_view_layout.cc2
-rw-r--r--chrome/browser/views/sad_tab_view.cc8
-rw-r--r--chrome/browser/views/tabs/browser_tab_strip_controller.cc8
-rw-r--r--chrome/browser/views/tabs/browser_tab_strip_controller.h2
-rw-r--r--chrome/browser/views/tabs/side_tab.cc127
-rw-r--r--chrome/browser/views/tabs/side_tab.h35
-rw-r--r--chrome/browser/views/tabs/side_tab_strip.cc22
-rw-r--r--chrome/browser/views/tabs/side_tab_strip.h9
-rw-r--r--skia/skia.gyp2
17 files changed, 243 insertions, 51 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index fdc8854..81305aa 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -150,6 +150,8 @@
'gfx/scrollbar_size.h',
'gfx/skbitmap_operations.cc',
'gfx/skbitmap_operations.h',
+ 'gfx/skia_util.cc',
+ 'gfx/skia_util.h',
'gfx/text_elider.cc',
'gfx/text_elider.h',
'gtk_dnd_util.cc',
diff --git a/app/gfx/canvas.cc b/app/gfx/canvas.cc
index 306531c4..420c984 100644
--- a/app/gfx/canvas.cc
+++ b/app/gfx/canvas.cc
@@ -221,6 +221,14 @@ void Canvas::DrawStringInt(const std::wstring& text,
l10n_util::DefaultCanvasTextAlignment());
}
+void Canvas::DrawStringInt(const std::wstring& text,
+ const gfx::Font& font,
+ const SkColor& color,
+ const gfx::Rect& display_rect) {
+ DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
+ display_rect.width(), display_rect.height());
+}
+
void Canvas::TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h) {
TileImageInt(bitmap, 0, 0, x, y, w, h);
}
diff --git a/app/gfx/canvas.h b/app/gfx/canvas.h
index e59db16..79eed9c 100644
--- a/app/gfx/canvas.h
+++ b/app/gfx/canvas.h
@@ -163,6 +163,8 @@ class Canvas : public skia::PlatformCanvas {
// text is too big, it is truncated and '...' is added to the end.
void DrawStringInt(const std::wstring& text, const gfx::Font& font,
const SkColor& color, int x, int y, int w, int h);
+ void DrawStringInt(const std::wstring& text, const gfx::Font& font,
+ const SkColor& color, const gfx::Rect& display_rect);
// Draws text with the specified color, font and location. The last argument
// specifies flags for how the text should be rendered. It can be one of
diff --git a/skia/ext/skia_utils.cc b/app/gfx/skia_util.cc
index c95054d..fa6ec24 100644
--- a/skia/ext/skia_utils.cc
+++ b/app/gfx/skia_util.cc
@@ -1,13 +1,29 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "skia/ext/skia_utils.h"
+#include "app/gfx/skia_util.h"
+
+#include "base/gfx/rect.h"
#include "third_party/skia/include/core/SkColorPriv.h"
#include "third_party/skia/include/core/SkShader.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
-namespace skia {
+namespace gfx {
+
+SkRect RectToSkRect(const gfx::Rect& rect) {
+ SkRect r;
+ r.set(SkIntToScalar(rect.x()), SkIntToScalar(rect.y()),
+ SkIntToScalar(rect.right()), SkIntToScalar(rect.bottom()));
+ return r;
+}
+
+gfx::Rect SkRectToRect(const SkRect& rect) {
+ return gfx::Rect(SkScalarToFixed(rect.fLeft),
+ SkScalarToFixed(rect.fTop),
+ SkScalarToFixed(rect.width()),
+ SkScalarToFixed(rect.height()));
+}
SkShader* CreateGradientShader(int start_point,
int end_point,
@@ -22,5 +38,5 @@ SkShader* CreateGradientShader(int start_point,
grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
}
-} // namespace skia
+} // namespace gfx
diff --git a/skia/ext/skia_utils.h b/app/gfx/skia_util.h
index 52d9d62..66a8aeb 100644
--- a/skia/ext/skia_utils.h
+++ b/app/gfx/skia_util.h
@@ -1,15 +1,22 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
-#ifndef SKIA_EXT_SKIA_UTILS_H_
-#define SKIA_EXT_SKIA_UTILS_H_
+#ifndef APP_GFX_SKIA_UTIL_H_
+#define APP_GFX_SKIA_UTIL_H_
#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkRect.h"
class SkShader;
-namespace skia {
+namespace gfx {
+
+class Rect;
+
+// Convert between Skia and gfx rect types.
+SkRect RectToSkRect(const gfx::Rect& rect);
+gfx::Rect SkRectToRect(const SkRect& rect);
// Creates a vertical gradient shader. The caller owns the shader.
// Example usage to avoid leaks:
@@ -21,7 +28,7 @@ SkShader* CreateGradientShader(int start_point,
int end_point,
SkColor start_color,
SkColor end_color);
-} // namespace skia
-#endif // SKIA_EXT_SKIA_UTILS_H_
+} // namespace gfx;
+#endif // APP_GFX_SKIA_UTIL_H_
diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc
index 1b02632..999119e 100644
--- a/chrome/browser/ntp_background_util.cc
+++ b/chrome/browser/ntp_background_util.cc
@@ -5,11 +5,11 @@
#include "chrome/browser/ntp_background_util.h"
#include "app/gfx/canvas.h"
+#include "app/gfx/skia_util.h"
#include "base/gfx/rect.h"
#include "base/logging.h"
#include "chrome/browser/browser_theme_provider.h"
#include "grit/theme_resources.h"
-#include "skia/ext/skia_utils.h"
#include "third_party/skia/include/core/SkBitmap.h"
namespace {
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 7e8c8d3..b6f4c8a 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -8,6 +8,7 @@
#include "app/gfx/canvas.h"
#include "app/gfx/color_utils.h"
+#include "app/gfx/skia_util.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/keyboard_codes.h"
@@ -32,7 +33,6 @@
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/theme_resources.h"
-#include "skia/ext/skia_utils.h"
#include "third_party/skia/include/core/SkShader.h"
#include "views/controls/button/menu_button.h"
#include "views/controls/label.h"
@@ -350,7 +350,7 @@ void BookmarkManagerView::PaintBackground(gfx::Canvas* canvas) {
canvas->drawColor(kBackgroundColorBottom, SkXfermode::kSrc_Mode);
SkPaint paint;
- paint.setShader(skia::CreateGradientShader(0, kBackgroundGradientHeight,
+ paint.setShader(gfx::CreateGradientShader(0, kBackgroundGradientHeight,
kBackgroundColorTop,
kBackgroundColorBottom))->safeUnref();
canvas->FillRectInt(0, 0, width(), kBackgroundGradientHeight, paint);
diff --git a/chrome/browser/views/detachable_toolbar_view.cc b/chrome/browser/views/detachable_toolbar_view.cc
index 924ecb0..a3773e6 100644
--- a/chrome/browser/views/detachable_toolbar_view.cc
+++ b/chrome/browser/views/detachable_toolbar_view.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/views/detachable_toolbar_view.h"
#include "app/gfx/canvas.h"
+#include "app/gfx/skia_util.h"
#include "app/resource_bundle.h"
#include "chrome/browser/browser_theme_provider.h"
#include "grit/theme_resources.h"
-#include "skia/ext/skia_utils.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkShader.h"
@@ -98,10 +98,10 @@ void DetachableToolbarView::PaintVerticalDivider(
const SkColor& bottom_color) {
// Draw the upper half of the divider.
SkPaint paint;
- paint.setShader(skia::CreateGradientShader(vertical_padding + 1,
- height / 2,
- top_color,
- middle_color))->safeUnref();
+ paint.setShader(gfx::CreateGradientShader(vertical_padding + 1,
+ height / 2,
+ top_color,
+ middle_color))->safeUnref();
SkRect rc = { SkIntToScalar(x),
SkIntToScalar(vertical_padding + 1),
SkIntToScalar(x + 1),
@@ -110,10 +110,10 @@ void DetachableToolbarView::PaintVerticalDivider(
// Draw the lower half of the divider.
SkPaint paint_down;
- paint_down.setShader(skia::CreateGradientShader(height / 2,
- height - vertical_padding,
- middle_color,
- bottom_color))->safeUnref();
+ paint_down.setShader(gfx::CreateGradientShader(height / 2,
+ height - vertical_padding,
+ middle_color,
+ bottom_color))->safeUnref();
SkRect rc_down = { SkIntToScalar(x),
SkIntToScalar(height / 2),
SkIntToScalar(x + 1),
diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc
index 2172268..332d836 100644
--- a/chrome/browser/views/frame/browser_view_layout.cc
+++ b/chrome/browser/views/frame/browser_view_layout.cc
@@ -283,7 +283,7 @@ int BrowserViewLayout::LayoutTabStrip() {
browser_view_->frame()->GetBoundsForTabStrip(tabstrip_);
if (browser_view_->UsingSideTabs()) {
- vertical_layout_rect_.Inset(layout_bounds.width(), 0, 0, 0);
+ vertical_layout_rect_.Inset(layout_bounds.right(), 0, 0, 0);
} else {
gfx::Rect toolbar_bounds = browser_view_->GetToolbarBounds();
tabstrip_->SetBackgroundOffset(
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index 9b9f839..8b6ebaa 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/views/sad_tab_view.h"
#include "app/gfx/canvas.h"
+#include "app/gfx/skia_util.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/gfx/size.h"
@@ -12,7 +13,6 @@
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/theme_resources.h"
-#include "skia/ext/skia_utils.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
static const int kSadTabOffset = -64;
@@ -52,9 +52,9 @@ SadTabView::SadTabView(TabContents* tab_contents)
void SadTabView::Paint(gfx::Canvas* canvas) {
SkPaint paint;
- paint.setShader(skia::CreateGradientShader(0, height(),
- kBackgroundColor,
- kBackgroundEndColor))->safeUnref();
+ paint.setShader(gfx::CreateGradientShader(0, height(),
+ kBackgroundColor,
+ kBackgroundEndColor))->safeUnref();
paint.setStyle(SkPaint::kFill_Style);
canvas->drawRectCoords(0, 0,
SkIntToScalar(width()), SkIntToScalar(height()),
diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/views/tabs/browser_tab_strip_controller.cc
index 2b4706e..ddc147c 100644
--- a/chrome/browser/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/views/tabs/browser_tab_strip_controller.cc
@@ -34,6 +34,14 @@ bool BrowserTabStripController::IsSelected(int index) const {
return model_->selected_index() == index;
}
+void BrowserTabStripController::SelectTab(int index) {
+ model_->SelectTabContentsAt(index, true);
+}
+
+void BrowserTabStripController::CloseTab(int index) {
+ model_->CloseTabContentsAt(index);
+}
+
////////////////////////////////////////////////////////////////////////////////
// BrowserTabStripController, TabStripModelObserver implementation:
diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.h b/chrome/browser/views/tabs/browser_tab_strip_controller.h
index 4db5fde..d2d6a90 100644
--- a/chrome/browser/views/tabs/browser_tab_strip_controller.h
+++ b/chrome/browser/views/tabs/browser_tab_strip_controller.h
@@ -20,6 +20,8 @@ class BrowserTabStripController : public SideTabStripModel,
virtual SkBitmap GetIcon(int index) const;
virtual string16 GetTitle(int index) const;
virtual bool IsSelected(int index) const;
+ virtual void SelectTab(int index);
+ virtual void CloseTab(int index);
// TabStripModelObserver implementation:
virtual void TabInsertedAt(TabContents* contents, int index,
diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
index e435bcb..8907a2e 100644
--- a/chrome/browser/views/tabs/side_tab.cc
+++ b/chrome/browser/views/tabs/side_tab.cc
@@ -5,50 +5,146 @@
#include "chrome/browser/views/tabs/side_tab.h"
#include "app/gfx/canvas.h"
+#include "app/gfx/skia_util.h"
#include "app/resource_bundle.h"
+#include "app/theme_provider.h"
#include "base/string_util.h"
+#include "grit/theme_resources.h"
+#include "views/controls/button/image_button.h"
namespace {
const int kVerticalTabHeight = 27;
-const int kTextPadding = 4;
-const int kFavIconHeight = 16;
+const int kIconSize = 16;
+const int kIconTitleSpacing = 4;
+const int kTitleCloseSpacing = 4;
+const SkScalar kRoundRectRadius = 5;
+const SkColor kTabBackgroundColor = SK_ColorWHITE;
+const SkAlpha kBackgroundTabAlpha = 200;
+static const int kHoverDurationMs = 900;
};
// static
gfx::Font* SideTab::font_ = NULL;
+SkBitmap* SideTab::close_button_n_ = NULL;
+SkBitmap* SideTab::close_button_h_ = NULL;
+SkBitmap* SideTab::close_button_p_ = NULL;
////////////////////////////////////////////////////////////////////////////////
// SideTab, public:
-SideTab::SideTab(SideTabModel* model) : model_(model) {
+SideTab::SideTab(SideTabModel* model)
+ : model_(model),
+ close_button_(NULL) {
InitClass();
+
+ views::ImageButton* close_button = new views::ImageButton(this);
+ close_button->SetImage(views::CustomButton::BS_NORMAL, close_button_n_);
+ close_button->SetImage(views::CustomButton::BS_HOT, close_button_h_);
+ close_button->SetImage(views::CustomButton::BS_PUSHED, close_button_p_);
+ close_button_ = close_button;
+ AddChildView(close_button_);
+
+ hover_animation_.reset(new SlideAnimation(this));
+ hover_animation_->SetSlideDuration(kHoverDurationMs);
}
SideTab::~SideTab() {
}
////////////////////////////////////////////////////////////////////////////////
+// SideTab, AnimationDelegate implementation:
+
+void SideTab::AnimationProgressed(const Animation* animation) {
+ SchedulePaint();
+}
+
+void SideTab::AnimationCanceled(const Animation* animation) {
+ AnimationEnded(animation);
+}
+
+void SideTab::AnimationEnded(const Animation* animation) {
+ SchedulePaint();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// SideTab, views::ButtonListener implementation:
+
+void SideTab::ButtonPressed(views::Button* sender, const views::Event& event) {
+ DCHECK(sender == close_button_);
+ model_->CloseTab(this);
+}
+
+////////////////////////////////////////////////////////////////////////////////
// SideTab, views::View overrides:
void SideTab::Layout() {
- // TODO(beng):
+ int icon_y;
+ int icon_x = icon_y = (height() - kIconSize) / 2;
+ icon_bounds_.SetRect(icon_x, icon_y, kIconSize, kIconSize);
+
+ gfx::Size ps = close_button_->GetPreferredSize();
+ int close_y = (height() - ps.height()) / 2;
+ close_button_->SetBounds(width() - ps.width() - close_y, close_y, ps.width(),
+ ps.height());
+
+ int title_y = (height() - font_->height()) / 2;
+ int title_x = icon_bounds_.right() + kIconTitleSpacing;
+ title_bounds_.SetRect(title_x, title_y,
+ close_button_->x() - kTitleCloseSpacing - title_x,
+ font_->height());
}
void SideTab::Paint(gfx::Canvas* canvas) {
- canvas->FillRectInt(model_->IsSelected(this) ? SK_ColorBLUE : SK_ColorRED,
- 0, 0, width(), height());
- gfx::Rect text_rect = GetLocalBounds(false);
- text_rect.Inset(kTextPadding, kTextPadding, kTextPadding, kTextPadding);
+ SkPaint paint;
+ paint.setColor(kTabBackgroundColor);
+ paint.setAntiAlias(true);
+ SkRect background_rect = gfx::RectToSkRect(GetLocalBounds(false));
+ canvas->drawRoundRect(background_rect, kRoundRectRadius, kRoundRectRadius,
+ paint);
+ canvas->DrawBitmapInt(model_->GetIcon(this), 0, 0, kIconSize, kIconSize,
+ icon_bounds_.x(), icon_bounds_.y(),
+ icon_bounds_.width(), icon_bounds_.height(), false);
canvas->DrawStringInt(UTF16ToWideHack(model_->GetTitle(this)), *font_,
- SK_ColorBLACK, text_rect.x(), text_rect.y(),
- text_rect.width(), text_rect.height());
+ SK_ColorBLACK, title_bounds_.x(), title_bounds_.y(),
+ title_bounds_.width(), title_bounds_.height());
+
+ if (!model_->IsSelected(this) &&
+ GetThemeProvider()->ShouldUseNativeFrame()) {
+ // Make sure un-selected tabs are somewhat transparent.
+ SkPaint paint;
+
+ SkAlpha opacity = kBackgroundTabAlpha;
+ if (hover_animation_->IsAnimating())
+ opacity = static_cast<SkAlpha>(hover_animation_->GetCurrentValue() * 255);
+
+ paint.setColor(SkColorSetARGB(kBackgroundTabAlpha, 255, 255, 255));
+ paint.setXfermodeMode(SkXfermode::kDstIn_Mode);
+ paint.setStyle(SkPaint::kFill_Style);
+ paint.setAntiAlias(true);
+ canvas->drawRoundRect(background_rect, kRoundRectRadius, kRoundRectRadius,
+ paint);
+ }
}
gfx::Size SideTab::GetPreferredSize() {
- const int kTabHeight = std::max(font_->height() + 2 * kTextPadding,
- kFavIconHeight + 2 * kTextPadding);
- return gfx::Size(0, kTabHeight);
+ return gfx::Size(0, 27);
+}
+
+void SideTab::OnMouseEntered(const views::MouseEvent& event) {
+ hover_animation_->SetTweenType(SlideAnimation::EASE_OUT);
+ hover_animation_->Show();
+}
+
+void SideTab::OnMouseExited(const views::MouseEvent& event) {
+ hover_animation_->SetTweenType(SlideAnimation::EASE_IN);
+ hover_animation_->Hide();
+}
+
+bool SideTab::OnMousePressed(const views::MouseEvent& event) {
+ if (event.IsOnlyLeftMouseButton())
+ model_->SelectTab(this);
+ return true;
}
////////////////////////////////////////////////////////////////////////////////
@@ -60,6 +156,11 @@ void SideTab::InitClass() {
if (!initialized) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
font_ = new gfx::Font(rb.GetFont(ResourceBundle::BaseFont));
+
+ close_button_n_ = rb.GetBitmapNamed(IDR_TAB_CLOSE);
+ close_button_h_ = rb.GetBitmapNamed(IDR_TAB_CLOSE_H);
+ close_button_p_ = rb.GetBitmapNamed(IDR_TAB_CLOSE_P);
+
initialized = true;
}
}
diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h
index 767b649..787cd33 100644
--- a/chrome/browser/views/tabs/side_tab.h
+++ b/chrome/browser/views/tabs/side_tab.h
@@ -6,7 +6,9 @@
#define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
#include "app/gfx/font.h"
+#include "app/slide_animation.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "views/controls/button/button.h"
#include "views/view.h"
class SideTab;
@@ -17,17 +19,36 @@ class SideTabModel {
virtual string16 GetTitle(SideTab* tab) const = 0;
virtual SkBitmap GetIcon(SideTab* tab) const = 0;
virtual bool IsSelected(SideTab* tab) const = 0;
+
+ // Selects the tab.
+ virtual void SelectTab(SideTab* tab) = 0;
+
+ // Closes the tab.
+ virtual void CloseTab(SideTab* tab) = 0;
};
-class SideTab : public views::View {
+class SideTab : public views::View,
+ public views::ButtonListener,
+ public AnimationDelegate {
public:
explicit SideTab(SideTabModel* model);
virtual ~SideTab();
+ // AnimationDelegate implementation:
+ virtual void AnimationProgressed(const Animation* animation);
+ virtual void AnimationCanceled(const Animation* animation);
+ virtual void AnimationEnded(const Animation* animation);
+
+ // views::ButtonListener implementation:
+ virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+
// views::View Overrides:
virtual void Layout();
virtual void Paint(gfx::Canvas* canvas);
virtual gfx::Size GetPreferredSize();
+ virtual void OnMouseEntered(const views::MouseEvent& event);
+ virtual void OnMouseExited(const views::MouseEvent& event);
+ virtual bool OnMousePressed(const views::MouseEvent& event);
private:
// Loads class-specific resources.
@@ -35,7 +56,19 @@ class SideTab : public views::View {
SideTabModel* model_;
+ gfx::Rect icon_bounds_;
+ gfx::Rect title_bounds_;
+
+ views::Button* close_button_;
+
+ // Hover animation.
+ scoped_ptr<SlideAnimation> hover_animation_;
+
static gfx::Font* font_;
+ static SkBitmap* close_button_n_;
+ static SkBitmap* close_button_m_;
+ static SkBitmap* close_button_h_;
+ static SkBitmap* close_button_p_;
DISALLOW_COPY_AND_ASSIGN(SideTab);
};
diff --git a/chrome/browser/views/tabs/side_tab_strip.cc b/chrome/browser/views/tabs/side_tab_strip.cc
index 3ea8a3d..04bd44b 100644
--- a/chrome/browser/views/tabs/side_tab_strip.cc
+++ b/chrome/browser/views/tabs/side_tab_strip.cc
@@ -15,6 +15,7 @@
namespace {
const int kVerticalTabSpacing = 2;
const int kTabStripWidth = 127;
+const int kTabStripInset = 3;
}
////////////////////////////////////////////////////////////////////////////////
@@ -79,6 +80,14 @@ bool SideTabStrip::IsSelected(SideTab* tab) const {
return model_->IsSelected(GetIndexOfSideTab(tab));
}
+void SideTabStrip::SelectTab(SideTab* tab) {
+ model_->SelectTab(GetIndexOfSideTab(tab));
+}
+
+void SideTabStrip::CloseTab(SideTab* tab) {
+ model_->CloseTab(GetIndexOfSideTab(tab));
+}
+
////////////////////////////////////////////////////////////////////////////////
// SideTabStrip, BaseTabStrip implementation:
@@ -90,7 +99,7 @@ void SideTabStrip::SetBackgroundOffset(const gfx::Point& offset) {
}
bool SideTabStrip::IsPositionInWindowCaption(const gfx::Point& point) {
- return true;
+ return GetViewForPoint(point) == this;
}
void SideTabStrip::SetDraggedTabBounds(int tab_index,
@@ -116,18 +125,17 @@ TabStrip* SideTabStrip::AsTabStrip() {
// SideTabStrip, views::View overrides:
void SideTabStrip::Layout() {
- int y = 0;
+ gfx::Rect layout_rect = GetLocalBounds(false);
+ layout_rect.Inset(kTabStripInset, kTabStripInset);
+ int y = layout_rect.y();
for (int c = GetChildViewCount(), i = 0; i < c; ++i) {
views::View* child = GetChildViewAt(i);
- child->SetBounds(0, y, width(), child->GetPreferredSize().height());
+ child->SetBounds(layout_rect.x(), y, layout_rect.width(),
+ child->GetPreferredSize().height());
y = child->bounds().bottom() + kVerticalTabSpacing;
}
}
-void SideTabStrip::Paint(gfx::Canvas* canvas) {
- // canvas->FillRectInt(SK_ColorGREEN, 0, 0, width(), height());
-}
-
gfx::Size SideTabStrip::GetPreferredSize() {
return gfx::Size(kTabStripWidth, 0);
}
diff --git a/chrome/browser/views/tabs/side_tab_strip.h b/chrome/browser/views/tabs/side_tab_strip.h
index 4cde29f..61a0bc4 100644
--- a/chrome/browser/views/tabs/side_tab_strip.h
+++ b/chrome/browser/views/tabs/side_tab_strip.h
@@ -17,6 +17,12 @@ class SideTabStripModel {
virtual SkBitmap GetIcon(int index) const = 0;
virtual string16 GetTitle(int index) const = 0;
virtual bool IsSelected(int index) const = 0;
+
+ // Select the tab at the specified index in the model.
+ virtual void SelectTab(int index) = 0;
+
+ // Closes the tab at the specified index in the model.
+ virtual void CloseTab(int index) = 0;
};
class SideTabStrip : public BaseTabStrip,
@@ -53,6 +59,8 @@ class SideTabStrip : public BaseTabStrip,
virtual string16 GetTitle(SideTab* tab) const;
virtual SkBitmap GetIcon(SideTab* tab) const;
virtual bool IsSelected(SideTab* tab) const;
+ virtual void SelectTab(SideTab* tab);
+ virtual void CloseTab(SideTab* tab);
// BaseTabStrip implementation:
virtual int GetPreferredHeight();
@@ -67,7 +75,6 @@ class SideTabStrip : public BaseTabStrip,
// views::View overrides:
virtual void Layout();
- virtual void Paint(gfx::Canvas* canvas);
virtual gfx::Size GetPreferredSize();
private:
diff --git a/skia/skia.gyp b/skia/skia.gyp
index f279b84..41da282 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -522,8 +522,6 @@
'ext/platform_device_win.cc',
'ext/platform_device_win.h',
'ext/SkMemory_new_handler.cpp',
- 'ext/skia_utils.cc',
- 'ext/skia_utils.h',
'ext/skia_utils_gtk.cc',
'ext/skia_utils_gtk.h',
'ext/skia_utils_mac.mm',
generated by cgit v1.1 at 2025-02-03 20:33:55 +0000