summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2014-05-22 22:41:30 +0200
committerKristian Høgsberg <krh@bitplanet.net>2014-06-18 17:14:39 -0700
commit91f80f24b4368fe36edbca676ea2777df29cfc5c (patch)
treea06620432b79d6963136803794fe8581e85a6c35
parented04d38f6aa700a4634aa3f44b971e012600ebe4 (diff)
animation: fix move scale animation
Both weston_move_scale_run() and weston_slide_run() were broken in commit 3a869019. Commit a4a6f161 fixed and explained the problem for weston_slide_run() but weston_move_scale_run() remained broken. To fix weston_move_scale_run(), weston_view_animation_run() is also required. It was removed when _run() was split into two functions _create() and _run() in commit f5cc2b56, but _run() was not added in this commit.
-rw-r--r--src/animation.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/animation.c b/src/animation.c
index a29b34ad..392e32dc 100644
--- a/src/animation.c
+++ b/src/animation.c
@@ -458,8 +458,10 @@ weston_move_scale_run(struct weston_view *view, int dx, int dy,
if (animation == NULL)
return NULL;
- weston_spring_init(&animation->spring, 400.0, start, end);
+ weston_spring_init(&animation->spring, 400.0, 0.0, 1.0);
animation->spring.friction = 1150;
+ weston_view_animation_run(animation);
+
return animation;
}