[clutter/wip/master-next: 28/31] grid-layout: Remove layout animations



commit 2fef1a174e3883bef569b67f6224e2d9ccbc8b97
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 11 13:11:13 2012 +0100

    grid-layout: Remove layout animations
    
    ClutterLayoutManager implementations should just defer the easing state
    set up to the child, and not try to impose a global one.

 clutter/clutter-grid-layout.c |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/clutter/clutter-grid-layout.c b/clutter/clutter-grid-layout.c
index 2ae6d96..f56774d 100644
--- a/clutter/clutter-grid-layout.c
+++ b/clutter/clutter-grid-layout.c
@@ -1388,9 +1388,6 @@ clutter_grid_layout_allocate (ClutterLayoutManager   *layout,
   ClutterGridLines *lines;
   ClutterActorIter iter;
   ClutterActor *child;
-  gboolean use_animations;
-  ClutterAnimationMode mode;
-  guint duration, delay;
 
   request.grid = self;
 
@@ -1411,11 +1408,6 @@ clutter_grid_layout_allocate (ClutterLayoutManager   *layout,
   clutter_grid_request_position (&request, 0);
   clutter_grid_request_position (&request, 1);
 
-  use_animations = clutter_layout_manager_get_easing_state (layout,
-                                                            &mode,
-                                                            &duration,
-                                                            &delay);
-
   clutter_actor_iter_init (&iter, CLUTTER_ACTOR (container));
   while (clutter_actor_iter_next (&iter, &child))
     {
@@ -1440,18 +1432,7 @@ clutter_grid_layout_allocate (ClutterLayoutManager   *layout,
                     _clutter_actor_get_debug_name (child),
                     x, y, width, height);
 
-      if (use_animations)
-        {
-          clutter_actor_save_easing_state (child);
-          clutter_actor_set_easing_mode (child, mode);
-          clutter_actor_set_easing_duration (child, duration);
-          clutter_actor_set_easing_delay (child, delay);
-        }
-
       clutter_actor_allocate (child, &child_allocation, flags);
-
-      if (use_animations)
-        clutter_actor_restore_easing_state (child);
     }
 }
 



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