[clutter/wip/master-next: 25/31] Revert "bin-layout: Implement layout animations"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/master-next: 25/31] Revert "bin-layout: Implement layout animations"
- Date: Wed, 11 Jul 2012 14:41:36 +0000 (UTC)
commit d381ab12076487a6efa9eb5f12645f5f26ddcf60
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jul 11 13:07:12 2012 +0100
Revert "bin-layout: Implement layout animations"
This reverts commit 03ec016faa146410c12b88851f0428d035933dd4.
ClutterLayoutManager implementations should just defer the easing state
set up to the child, and not try to impose a global one.
clutter/clutter-bin-layout.c | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/clutter/clutter-bin-layout.c b/clutter/clutter-bin-layout.c
index 20c3051..364851d 100644
--- a/clutter/clutter-bin-layout.c
+++ b/clutter/clutter-bin-layout.c
@@ -434,19 +434,12 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
gfloat available_w, available_h;
ClutterActor *actor, *child;
ClutterActorIter iter;
- gboolean use_animations;
- ClutterAnimationMode easing_mode;
- guint easing_duration, easing_delay;
clutter_actor_box_get_origin (allocation, &allocation_x, &allocation_y);
clutter_actor_box_get_size (allocation, &available_w, &available_h);
actor = CLUTTER_ACTOR (container);
- use_animations = clutter_layout_manager_get_easing_state (manager,
- &easing_mode,
- &easing_duration,
- &easing_delay);
clutter_actor_iter_init (&iter, actor);
while (clutter_actor_iter_next (&iter, &child))
{
@@ -513,21 +506,10 @@ clutter_bin_layout_allocate (ClutterLayoutManager *manager,
y_align = get_bin_alignment_factor (layer->y_align);
}
- if (use_animations)
- {
- clutter_actor_save_easing_state (child);
- clutter_actor_set_easing_mode (child, easing_mode);
- clutter_actor_set_easing_duration (child, easing_duration);
- clutter_actor_set_easing_delay (child, easing_delay);
- }
-
clutter_actor_allocate_align_fill (child, &child_alloc,
x_align, y_align,
x_fill, y_fill,
flags);
-
- if (use_animations)
- clutter_actor_restore_easing_state (child);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]