From: Pekka Paalanen <ppaalanen@gmail.com>
Date: Fri, 2 Dec 2011 08:39:49 +0000 (+0200)
Subject: compositor: fix re-fading
X-Git-Tag: upstream/0.1.8~3143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e097ee42a5ed0ec03bfdada5bc9dc3b428392da;p=profile%2Fivi%2Fweston-ivi-shell.git

compositor: fix re-fading

Reorder code in fade_frame() to that if shell->lock() calls
wlsc_compositor_wake(), the fade animation will run again.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
---

diff --git a/compositor/compositor.c b/compositor/compositor.c
index 4f25b6d..6ee2298 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -750,14 +750,15 @@ fade_frame(struct wlsc_animation *animation,
 
 	wlsc_spring_update(&compositor->fade.spring, msecs);
 	if (wlsc_spring_done(&compositor->fade.spring)) {
-		if (compositor->fade.spring.current > 0.999) {
-			compositor->state = WLSC_COMPOSITOR_SLEEPING;
-			compositor->shell->lock(compositor->shell);
-		}
 		compositor->fade.spring.current =
 			compositor->fade.spring.target;
 		wl_list_remove(&animation->link);
 		wl_list_init(&animation->link);
+
+		if (compositor->fade.spring.current > 0.999) {
+			compositor->state = WLSC_COMPOSITOR_SLEEPING;
+			compositor->shell->lock(compositor->shell);
+		}
 	}
 
 	wlsc_output_damage(output);