diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:54:29 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 00:54:29 +0000 |
| commit | d84d7e11085d6c7cd5028ceeb5309baecab1e79f (patch) | |
| tree | 97a9ee529e10e2e8712d267d45c22440739fda2a /ui/base/animation | |
| parent | 20504aff17c993fc94bec8e7f54a5d5d83775295 (diff) | |
| download | chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.zip chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.tar.gz chromium_src-d84d7e11085d6c7cd5028ceeb5309baecab1e79f.tar.bz2 | |
Tweaks workspace2 animations based on input from Nicholas.
BUG=146892
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10910143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/animation')
| -rw-r--r-- | ui/base/animation/tween.cc | 3 | ||||
| -rw-r--r-- | ui/base/animation/tween.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc index fa299c1..51dd298 100644 --- a/ui/base/animation/tween.cc +++ b/ui/base/animation/tween.cc @@ -24,6 +24,9 @@ double Tween::CalculateValue(Tween::Type type, double state) { case EASE_IN: return pow(state, 2); + case EASE_IN_2: + return pow(state, 4); + case EASE_IN_OUT: if (state < 0.5) return pow(state * 2, 2) / 2.0; diff --git a/ui/base/animation/tween.h b/ui/base/animation/tween.h index ca10a0a..46e30e1 100644 --- a/ui/base/animation/tween.h +++ b/ui/base/animation/tween.h @@ -18,6 +18,7 @@ class UI_EXPORT Tween { LINEAR, // Linear. EASE_OUT, // Fast in, slow out (default). EASE_IN, // Slow in, fast out. + EASE_IN_2, // Variant of EASE_IN that starts out slower. EASE_IN_OUT, // Slow in and out, fast in the middle. FAST_IN_OUT, // Fast in and out, slow in the middle. EASE_OUT_SNAP, // Fast in, slow out, snap to final value. |