diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2014-05-22 22:41:30 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-06-25 16:29:02 +0300 |
| commit | 4191e3979098deafde1757b922e5243454fbe4cb (patch) | |
| tree | ce1c7e5db5633539a51a018b64c25598137c450a | |
| parent | eff280ec1c63f7c19d1e5c6e3ea4110603956b34 (diff) | |
| download | weston-4191e3979098deafde1757b922e5243454fbe4cb.tar.gz | |
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.c | 4 |
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; } |