diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 18:56:27 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 18:56:27 +0000 |
| commit | e43c966ec93e5ca832c39a152ce70378033d6951 (patch) | |
| tree | 1369568e4449c47b660f74c63b32631d0f545f66 /ui | |
| parent | bb3be3d70b54aa06ede962d9189a9d6f8c69c7c5 (diff) | |
| download | chromium_src-e43c966ec93e5ca832c39a152ce70378033d6951.zip chromium_src-e43c966ec93e5ca832c39a152ce70378033d6951.tar.gz chromium_src-e43c966ec93e5ca832c39a152ce70378033d6951.tar.bz2 | |
Fix LabelButton::GetThemeAnimation() logic.
My http://crrev.com/162245 missed the animation difference between:
TextButtonBorder::Paint() and TextButtonNativeThemeBorder::Paint().
Also update a low priority TODO.
BUG=155363
TEST=Test [long kHoverAnimationDurationMs] animations in views examples.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11225024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/views/controls/button/label_button.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/label_button_border.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc index a408240..d2c6a3e 100644 --- a/ui/views/controls/button/label_button.cc +++ b/ui/views/controls/button/label_button.cc @@ -230,7 +230,7 @@ ui::NativeTheme::State LabelButton::GetThemeState( const ui::Animation* LabelButton::GetThemeAnimation() const { #if defined(OS_WIN) && !defined(USE_AURA) - if (!ui::NativeThemeWin::instance()->IsThemingActive()) + if (native_theme() && !ui::NativeThemeWin::instance()->IsThemingActive()) return NULL; #endif return hover_animation_.get(); diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc index faa7ebc..888b6dc 100644 --- a/ui/views/controls/button/label_button_border.cc +++ b/ui/views/controls/button/label_button_border.cc @@ -65,7 +65,7 @@ void LabelButtonBorder::Paint(const View& view, gfx::Canvas* canvas) const { PaintNativeTheme(view, canvas); } else if (native_theme_delegate_->GetThemeAnimation() && native_theme_delegate_->GetThemeAnimation()->is_animating()) { - // TODO(pkasting|msw): Crossfade between button state image sets. + // TODO(msw): Crossfade between image sets; no-op for equivalent images. canvas->SaveLayerAlpha(static_cast<uint8>(native_theme_delegate_-> GetThemeAnimation()->CurrentValueBetween(0, 255))); canvas->DrawColor(SkColorSetARGB(0x00, 0xFF, 0xFF, 0xFF), |