[glide] Fix the animations broken by stacking order changes introduced by making slides selectable



commit 893bedfde35706654af08b8db5e13d8c47901cbe
Author: Robert Carr <racarr Valentine localdomain>
Date:   Sat May 1 21:07:17 2010 -0400

    Fix the animations broken by stacking order changes introduced by making slides selectable

 src/glide-animations.c         |    2 +-
 src/glide-inspector-notebook.c |    5 -----
 src/glide-vala-animations.vala |    4 ++++
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/glide-animations.c b/src/glide-animations.c
index 12aa69d..73cb7a3 100644
--- a/src/glide-animations.c
+++ b/src/glide-animations.c
@@ -134,7 +134,7 @@ glide_animations_animate_drop (const GlideAnimationInfo *info, ClutterActor *a,
   ClutterActor *stage = clutter_actor_get_stage (a);
   
   clutter_actor_show_all (b);
-  clutter_actor_raise (b, a);
+  clutter_actor_raise (b,a);
 
   clutter_actor_set_y (b, -clutter_actor_get_height (CLUTTER_ACTOR (stage)));
   clutter_actor_animate_with_timeline (b, CLUTTER_EASE_OUT_BOUNCE, timeline, "y", 0, NULL);  
diff --git a/src/glide-inspector-notebook.c b/src/glide-inspector-notebook.c
index d65677a..ad8b6b0 100644
--- a/src/glide-inspector-notebook.c
+++ b/src/glide-inspector-notebook.c
@@ -144,11 +144,6 @@ void
 glide_inspector_notebook_set_stage_manager (GlideInspectorNotebook *inspector,
 					    GlideStageManager *manager)
 {
-  if (inspector->priv->selection_changed_id)
-    {
-      g_signal_handler_disconnect (inspector->priv->manager,
-				   inspector->priv->selection_changed_id);
-    }
   inspector->priv->manager = manager;
   inspector->priv->selection_changed_id = g_signal_connect (inspector->priv->manager,
 							    "selection-changed",
diff --git a/src/glide-vala-animations.vala b/src/glide-vala-animations.vala
index 185fa97..7c7e02d 100644
--- a/src/glide-vala-animations.vala
+++ b/src/glide-vala-animations.vala
@@ -83,6 +83,8 @@ namespace Glide {
 		var timeline = new Clutter.Timeline(info.duration);
 
 		b.show_all();
+		b.raise(a);
+
 		b.y = -a.height;
 		b.animate_with_timeline(Clutter.AnimationMode.EASE_OUT_BOUNCE, timeline, "y", 0.0);
 		
@@ -114,6 +116,7 @@ namespace Glide {
 		float xpos = 0, ypos = 0, angle = 90;
 		
 		b.show_all();
+		b.raise(a);
 		
 		switch (info.option)
 		{
@@ -193,6 +196,7 @@ namespace Glide {
 		var timeline = new Clutter.Timeline (info.duration);
 		
 		b.show_all();
+		b.raise(a);
 		
 		switch (info.option)
 		{



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]