summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/button
diff options
context:
space:
mode:
Diffstat (limited to 'ui/views/controls/button')
-rw-r--r--ui/views/controls/button/checkbox.cc35
-rw-r--r--ui/views/controls/button/checkbox.h6
-rw-r--r--ui/views/controls/button/radio_button.cc6
-rw-r--r--ui/views/controls/button/radio_button.h4
-rw-r--r--ui/views/controls/button/text_button.cc80
-rw-r--r--ui/views/controls/button/text_button.h20
6 files changed, 74 insertions, 77 deletions
diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
index 8e85a2d..cfedcce 100644
--- a/ui/views/controls/button/checkbox.cc
+++ b/ui/views/controls/button/checkbox.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -36,11 +36,10 @@ void Checkbox::SetChecked(bool checked) {
gfx::Size Checkbox::GetPreferredSize() {
gfx::Size prefsize(TextButtonBase::GetPreferredSize());
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = GetThemeState(&extra);
- gfx::Size size = gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
- state,
- extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = GetThemeState(&extra);
+ gfx::Size size = ui::NativeTheme::instance()->GetPartSize(GetThemePart(),
+ state, extra);
prefsize.Enlarge(size.width(), 0);
prefsize.set_height(std::max(prefsize.height(), size.height()));
@@ -76,16 +75,15 @@ void Checkbox::NotifyClick(const views::Event& event) {
TextButtonBase::NotifyClick(event);
}
-gfx::NativeTheme::Part Checkbox::GetThemePart() const {
- return gfx::NativeTheme::kCheckbox;
+ui::NativeTheme::Part Checkbox::GetThemePart() const {
+ return ui::NativeTheme::kCheckbox;
}
gfx::Rect Checkbox::GetThemePaintRect() const {
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = GetThemeState(&extra);
- gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
- state,
- extra));
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = GetThemeState(&extra);
+ gfx::Size size(ui::NativeTheme::instance()->GetPartSize(GetThemePart(), state,
+ extra));
gfx::Insets insets = GetInsets();
int y_offset = (height() - size.height()) / 2;
gfx::Rect rect(insets.left(), y_offset, size.width(), size.height());
@@ -93,18 +91,17 @@ gfx::Rect Checkbox::GetThemePaintRect() const {
return rect;
}
-void Checkbox::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
+void Checkbox::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
TextButtonBase::GetExtraParams(params);
params->button.checked = checked_;
}
gfx::Rect Checkbox::GetTextBounds() const {
gfx::Rect bounds(TextButtonBase::GetTextBounds());
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = GetThemeState(&extra);
- gfx::Size size(gfx::NativeTheme::instance()->GetPartSize(GetThemePart(),
- state,
- extra));
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = GetThemeState(&extra);
+ gfx::Size size(ui::NativeTheme::instance()->GetPartSize(GetThemePart(), state,
+ extra));
bounds.Offset(size.width() + kCheckboxLabelSpacing, 0);
return bounds;
}
diff --git a/ui/views/controls/button/checkbox.h b/ui/views/controls/button/checkbox.h
index b86c7c6..7554cfd 100644
--- a/ui/views/controls/button/checkbox.h
+++ b/ui/views/controls/button/checkbox.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -43,10 +43,10 @@ class VIEWS_EXPORT Checkbox : public TextButtonBase {
virtual void NotifyClick(const views::Event& event) OVERRIDE;
// Overridden from TextButtonBase:
- virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE;
+ virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
virtual void GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
virtual gfx::Rect GetTextBounds() const OVERRIDE;
// True if the checkbox is checked.
diff --git a/ui/views/controls/button/radio_button.cc b/ui/views/controls/button/radio_button.cc
index 1c3352cd..5218bcf 100644
--- a/ui/views/controls/button/radio_button.cc
+++ b/ui/views/controls/button/radio_button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -97,8 +97,8 @@ void RadioButton::NotifyClick(const views::Event& event) {
TextButtonBase::NotifyClick(event);
}
-gfx::NativeTheme::Part RadioButton::GetThemePart() const {
- return gfx::NativeTheme::kRadio;
+ui::NativeTheme::Part RadioButton::GetThemePart() const {
+ return ui::NativeTheme::kRadio;
}
} // namespace views
diff --git a/ui/views/controls/button/radio_button.h b/ui/views/controls/button/radio_button.h
index 19ef602..2fa9a97 100644
--- a/ui/views/controls/button/radio_button.h
+++ b/ui/views/controls/button/radio_button.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -32,7 +32,7 @@ class VIEWS_EXPORT RadioButton : public Checkbox {
virtual void NotifyClick(const views::Event& event) OVERRIDE;
// Overridden from TextButtonBase:
- virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE;
+ virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
// Overridden from Checkbox:
virtual void SetChecked(bool checked) OVERRIDE;
diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index 89aa97d..1e616da 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -18,7 +18,7 @@
#if defined(OS_WIN)
#include "skia/ext/skia_utils_win.h"
-#include "ui/gfx/native_theme_win.h"
+#include "ui/base/native_theme/native_theme_win.h"
#include "ui/gfx/platform_font_win.h"
#endif
@@ -208,30 +208,30 @@ TextButtonNativeThemeBorder::~TextButtonNativeThemeBorder() {
void TextButtonNativeThemeBorder::Paint(const View& view,
gfx::Canvas* canvas) const {
const TextButtonBase* tb = static_cast<const TextButton*>(&view);
- const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
- gfx::NativeTheme::Part part = delegate_->GetThemePart();
+ const ui::NativeTheme* native_theme = ui::NativeTheme::instance();
+ ui::NativeTheme::Part part = delegate_->GetThemePart();
gfx::Rect rect(delegate_->GetThemePaintRect());
if (tb->show_multiple_icon_states() &&
delegate_->GetThemeAnimation() != NULL &&
delegate_->GetThemeAnimation()->is_animating()) {
// Paint background state.
- gfx::NativeTheme::ExtraParams prev_extra;
- gfx::NativeTheme::State prev_state =
+ ui::NativeTheme::ExtraParams prev_extra;
+ ui::NativeTheme::State prev_state =
delegate_->GetBackgroundThemeState(&prev_extra);
native_theme->Paint(canvas->sk_canvas(), part, prev_state, rect,
prev_extra);
// Composite foreground state above it.
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
canvas->Restore();
} else {
- gfx::NativeTheme::ExtraParams extra;
- gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
+ ui::NativeTheme::ExtraParams extra;
+ ui::NativeTheme::State state = delegate_->GetThemeState(&extra);
native_theme->Paint(canvas->sk_canvas(), part, state, rect, extra);
}
}
@@ -252,16 +252,16 @@ TextButtonBase::TextButtonBase(ButtonListener* listener, const string16& text)
alignment_(ALIGN_LEFT),
font_(ResourceBundle::GetSharedInstance().GetFont(
ResourceBundle::BaseFont)),
- color_(gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
- color_enabled_(gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
- color_disabled_(gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonDisabledColor)),
- color_highlight_(gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonHighlightColor)),
- color_hover_(gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonHoverColor)),
+ color_(ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonEnabledColor)),
+ color_enabled_(ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonEnabledColor)),
+ color_disabled_(ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonDisabledColor)),
+ color_highlight_(ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonHighlightColor)),
+ color_hover_(ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonHoverColor)),
text_halo_color_(0),
has_text_halo_(false),
active_text_shadow_color_(0),
@@ -458,15 +458,15 @@ int TextButtonBase::ComputeCanvasStringFlags() const {
}
void TextButtonBase::GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const {
+ ui::NativeTheme::ExtraParams* params) const {
params->button.checked = false;
params->button.indeterminate = false;
params->button.is_default = false;
params->button.has_border = false;
params->button.classic_state = 0;
params->button.background_color =
- gfx::NativeTheme::instance()->GetSystemColor(
- gfx::NativeTheme::kColorId_TextButtonBackgroundColor);
+ ui::NativeTheme::instance()->GetSystemColor(
+ ui::NativeTheme::kColorId_TextButtonBackgroundColor);
}
gfx::Rect TextButtonBase::GetContentBounds(int extra_width) const {
@@ -608,21 +608,21 @@ gfx::Rect TextButtonBase::GetThemePaintRect() const {
return GetLocalBounds();
}
-gfx::NativeTheme::State TextButtonBase::GetThemeState(
- gfx::NativeTheme::ExtraParams* params) const {
+ui::NativeTheme::State TextButtonBase::GetThemeState(
+ ui::NativeTheme::ExtraParams* params) const {
GetExtraParams(params);
switch(state()) {
case BS_DISABLED:
- return gfx::NativeTheme::kDisabled;
+ return ui::NativeTheme::kDisabled;
case BS_NORMAL:
- return gfx::NativeTheme::kNormal;
+ return ui::NativeTheme::kNormal;
case BS_HOT:
- return gfx::NativeTheme::kHovered;
+ return ui::NativeTheme::kHovered;
case BS_PUSHED:
- return gfx::NativeTheme::kPressed;
+ return ui::NativeTheme::kPressed;
default:
NOTREACHED() << "Unknown state: " << state();
- return gfx::NativeTheme::kNormal;
+ return ui::NativeTheme::kNormal;
}
}
@@ -630,23 +630,23 @@ const ui::Animation* TextButtonBase::GetThemeAnimation() const {
#if defined(USE_AURA)
return hover_animation_.get();
#elif defined(OS_WIN)
- return gfx::NativeThemeWin::instance()->IsThemingActive()
+ return ui::NativeThemeWin::instance()->IsThemingActive()
? hover_animation_.get() : NULL;
#else
return hover_animation_.get();
#endif
}
-gfx::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
- gfx::NativeTheme::ExtraParams* params) const {
+ui::NativeTheme::State TextButtonBase::GetBackgroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const {
GetExtraParams(params);
- return gfx::NativeTheme::kNormal;
+ return ui::NativeTheme::kNormal;
}
-gfx::NativeTheme::State TextButtonBase::GetForegroundThemeState(
- gfx::NativeTheme::ExtraParams* params) const {
+ui::NativeTheme::State TextButtonBase::GetForegroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const {
GetExtraParams(params);
- return gfx::NativeTheme::kHovered;
+ return ui::NativeTheme::kHovered;
}
////////////////////////////////////////////////////////////////////////////////
@@ -756,11 +756,11 @@ void TextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
}
}
-gfx::NativeTheme::Part TextButton::GetThemePart() const {
- return gfx::NativeTheme::kPushButton;
+ui::NativeTheme::Part TextButton::GetThemePart() const {
+ return ui::NativeTheme::kPushButton;
}
-void TextButton::GetExtraParams(gfx::NativeTheme::ExtraParams* params) const {
+void TextButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
TextButtonBase::GetExtraParams(params);
params->button.is_default = is_default_;
}
@@ -848,7 +848,7 @@ void NativeTextButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
}
void NativeTextButton::GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const {
+ ui::NativeTheme::ExtraParams* params) const {
TextButton::GetExtraParams(params);
params->button.has_border = true;
}
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
index 2e1f285..2dd1cb8 100644
--- a/ui/views/controls/button/text_button.h
+++ b/ui/views/controls/button/text_button.h
@@ -225,15 +225,15 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,
// Overridden from NativeThemeDelegate:
virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
- virtual gfx::NativeTheme::State GetThemeState(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ virtual ui::NativeTheme::State GetThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
virtual const ui::Animation* GetThemeAnimation() const OVERRIDE;
- virtual gfx::NativeTheme::State GetBackgroundThemeState(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
- virtual gfx::NativeTheme::State GetForegroundThemeState(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ virtual ui::NativeTheme::State GetBackgroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
+ virtual ui::NativeTheme::State GetForegroundThemeState(
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
- virtual void GetExtraParams(gfx::NativeTheme::ExtraParams* params) const;
+ virtual void GetExtraParams(ui::NativeTheme::ExtraParams* params) const;
virtual gfx::Rect GetTextBounds() const;
@@ -353,11 +353,11 @@ class VIEWS_EXPORT TextButton : public TextButtonBase {
virtual const SkBitmap& GetImageToPaint() const;
// Overridden from NativeThemeDelegate:
- virtual gfx::NativeTheme::Part GetThemePart() const OVERRIDE;
+ virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
// Overridden from TextButtonBase:
virtual void GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
virtual gfx::Rect GetTextBounds() const OVERRIDE;
private:
@@ -413,7 +413,7 @@ class VIEWS_EXPORT NativeTextButton : public TextButton {
// Overridden from TextButton:
virtual void GetExtraParams(
- gfx::NativeTheme::ExtraParams* params) const OVERRIDE;
+ ui::NativeTheme::ExtraParams* params) const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(NativeTextButton);
};
generated by cgit v1.1 at 2025-01-10 21:20:42 +0000