diff options
| author | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 20:53:14 +0000 |
|---|---|---|
| committer | vollick@chromium.org <vollick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 20:53:14 +0000 |
| commit | b4bb9ca0f57a0375e80cd662f0233298ed987a72 (patch) | |
| tree | 179c4eec26b5ba6a160865eea51f1155d9572116 /chrome/browser/ui/touch | |
| parent | 0531171e5800f313832a5200266a115bbc5041ff (diff) | |
| download | chromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.zip chromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.tar.gz chromium_src-b4bb9ca0f57a0375e80cd662f0233298ed987a72.tar.bz2 | |
Allow animating alpha
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7979020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/touch')
| -rw-r--r-- | chrome/browser/ui/touch/keyboard/keyboard_manager.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/touch/keyboard/keyboard_manager.cc b/chrome/browser/ui/touch/keyboard/keyboard_manager.cc index f521dc8..dec1dd4 100644 --- a/chrome/browser/ui/touch/keyboard/keyboard_manager.cc +++ b/chrome/browser/ui/touch/keyboard/keyboard_manager.cc @@ -22,6 +22,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/ime/text_input_type.h" +#include "ui/gfx/compositor/layer.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" #include "views/ime/text_input_type_tracker.h" @@ -261,8 +262,10 @@ bool KeyboardWidget::OnKeyEvent(const views::KeyEvent& event) { } void KeyboardWidget::AnimationProgressed(const ui::Animation* animation) { - GetRootView()->SetTransform( - transform_->Interpolate(animation_->GetCurrentValue())); + float t = static_cast<float>(animation_->GetCurrentValue()); + if (GetRootView()->layer()) + GetRootView()->layer()->SetOpacity(t * t); + GetRootView()->SetTransform(transform_->Interpolate(t)); } void KeyboardWidget::AnimationEnded(const ui::Animation* animation) { |