summaryrefslogtreecommitdiffstats
path: root/app/animation.cc
diff options
context:
space:
mode:
Diffstat (limited to 'app/animation.cc')
-rw-r--r--app/animation.cc20
1 files changed, 20 insertions, 0 deletions
diff --git a/app/animation.cc b/app/animation.cc
index 94c99c2..b341d2a 100644
--- a/app/animation.cc
+++ b/app/animation.cc
@@ -4,6 +4,7 @@
#include "app/animation.h"
+#include "base/gfx/rect.h"
#include "base/message_loop.h"
#if defined(OS_WIN)
@@ -47,6 +48,25 @@ double Animation::GetCurrentValue() const {
return state_;
}
+double Animation::CurrentValueBetween(double start, double target) const {
+ return start + (target - start) * GetCurrentValue();
+}
+
+int Animation::CurrentValueBetween(int start, int target) const {
+ return static_cast<int>(CurrentValueBetween(static_cast<double>(start),
+ static_cast<double>(target)));
+}
+
+gfx::Rect Animation::CurrentValueBetween(const gfx::Rect& start_bounds,
+ const gfx::Rect& target_bounds) const {
+ return gfx::Rect(CurrentValueBetween(start_bounds.x(), target_bounds.x()),
+ CurrentValueBetween(start_bounds.y(), target_bounds.y()),
+ CurrentValueBetween(start_bounds.width(),
+ target_bounds.width()),
+ CurrentValueBetween(start_bounds.height(),
+ target_bounds.height()));
+}
+
void Animation::Start() {
if (!animating_) {
start_time_ = Time::Now();