[clutter/wip/master-next: 27/31] Revert "flow-layout: Implement layout animations"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/master-next: 27/31] Revert "flow-layout: Implement layout animations"
- Date: Wed, 11 Jul 2012 14:41:46 +0000 (UTC)
commit 5a1c16de629cff844d1540cbcd82ded7a40c04be
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jul 11 13:09:19 2012 +0100
Revert "flow-layout: Implement layout animations"
This reverts commit 320fb156b41fad5048b69acb7ca7a7e582b49182.
ClutterLayoutManager implementations should just defer the easing state
set up to the child, and not try to impose a global one.
clutter/clutter-flow-layout.c | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 878feeb..97524b2 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -568,9 +568,6 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
gint line_item_count;
gint items_per_line;
gint line_index;
- gboolean use_animations;
- ClutterAnimationMode easing_mode;
- guint easing_duration, easing_delay;
actor = CLUTTER_ACTOR (container);
if (clutter_actor_get_n_children (actor) == 0)
@@ -603,11 +600,6 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
line_item_count = 0;
line_index = 0;
- 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))
{
@@ -709,20 +701,8 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
child_alloc.y1 = ceil (item_y);
child_alloc.x2 = ceil (child_alloc.x1 + item_width);
child_alloc.y2 = ceil (child_alloc.y1 + item_height);
-
- 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 (child, &child_alloc, flags);
- if (use_animations)
- clutter_actor_restore_easing_state (child);
-
if (priv->orientation == CLUTTER_FLOW_HORIZONTAL)
item_x = new_x;
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]