commit 5e396ae9ae0e8d869d8ba162558f2721e568e187
author Axel Davy <axel.davy@ens.fr> Tue Sep 17 14:55:55 2013 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sat Sep 21 11:26:46 2013 -0700
tree 96e4cf0d28e32e071009aef075138a4433d1ec35
parent fda265268df11b37158382d125a360800be8ba55

Restoring alpha after the shell effects.

After the fade or zoom effects, alpha could not have been 1.0, preventing
not redrawing behind opaque windows.

This patch add a reset function in weston_surface_animation to reset
some variables the effects affect.

Signed-off-by: Axel Davy <axel.davy@ens.fr>

src/animation.c

diff --git a/src/animation.c b/src/animation.c
index 0b2fa95..909e243 100644
--- a/src/animation.c
+++ b/src/animation.c
@@ -124,6 +124,7 @@
 	struct wl_listener listener;
 	float start, stop;
 	weston_surface_animation_frame_func_t frame;
+	weston_surface_animation_frame_func_t reset;
 	weston_surface_animation_done_func_t done;
 	void *data;
 };
@@ -134,6 +135,8 @@
 	wl_list_remove(&animation->animation.link);
 	wl_list_remove(&animation->listener.link);
 	wl_list_remove(&animation->transform.link);
+	if (animation->reset)
+		animation->reset(animation);
 	weston_surface_geometry_dirty(animation->surface);
 	if (animation->done)
 		animation->done(animation, animation->data);
@@ -179,6 +182,7 @@
 weston_surface_animation_run(struct weston_surface *surface,
 			     float start, float stop,
 			     weston_surface_animation_frame_func_t frame,
+			     weston_surface_animation_frame_func_t reset,
 			     weston_surface_animation_done_func_t done,
 			     void *data)
 {
@@ -190,6 +194,7 @@
 
 	animation->surface = surface;
 	animation->frame = frame;
+	animation->reset = reset;
 	animation->done = done;
 	animation->data = data;
 	animation->start = start;
@@ -213,6 +218,14 @@
 }
 
 static void
+reset_alpha(struct weston_surface_animation *animation)
+{
+	struct weston_surface *surface = animation->surface;
+
+	surface->alpha = animation->stop;
+}
+
+static void
 zoom_frame(struct weston_surface_animation *animation)
 {
 	struct weston_surface *es = animation->surface;
@@ -242,7 +255,8 @@
 	struct weston_surface_animation *zoom;
 
 	zoom = weston_surface_animation_run(surface, start, stop,
-					    zoom_frame, done, data);
+					    zoom_frame, reset_alpha,
+					    done, data);
 
 	weston_spring_init(&zoom->spring, 300.0, start, stop);
 	zoom->spring.friction = 1400;
@@ -269,8 +283,9 @@
 {
 	struct weston_surface_animation *fade;
 
-	fade = weston_surface_animation_run(surface, 0, 0,
-					    fade_frame, done, data);
+	fade = weston_surface_animation_run(surface, 0, end,
+					    fade_frame, reset_alpha,
+					    done, data);
 
 	weston_spring_init(&fade->spring, k, start, end);
 
@@ -307,7 +322,8 @@
 	struct weston_surface_animation *animation;
 
 	animation = weston_surface_animation_run(surface, start, stop,
-						 slide_frame, done, data);
+						 slide_frame, NULL, done,
+						 data);
 	if (!animation)
 		return NULL;