brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "flow-layout: Implement layout animations"

Browse Source 
This reverts commit 320fb156b4.

ClutterLayoutManager implementations should just defer the easing state
set up to the child, and not try to impose a global one.
This commit is contained in:
Emmanuele Bassi 2012-07-11 13:09:19 +01:00
parent b4994f9e76
commit 5a1c16de62
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-flow-layout.c
View File

@ -568,9 +568,6 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
gint line_item_count; gint line_item_count;
gint items_per_line; gint items_per_line;
gint line_index; gint line_index;
gboolean use_animations;
ClutterAnimationMode easing_mode;
guint easing_duration, easing_delay;
actor = CLUTTER_ACTOR (container); actor = CLUTTER_ACTOR (container);
if (clutter_actor_get_n_children (actor) == 0) if (clutter_actor_get_n_children (actor) == 0)
@ -603,11 +600,6 @@ clutter_flow_layout_allocate (ClutterLayoutManager *manager,
line_item_count = 0; line_item_count = 0;
line_index = 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); clutter_actor_iter_init (&iter, actor);
while (clutter_actor_iter_next (&iter, &child)) 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.y1 = ceil (item_y);
child_alloc.x2 = ceil (child_alloc.x1 + item_width); child_alloc.x2 = ceil (child_alloc.x1 + item_width);
child_alloc.y2 = ceil (child_alloc.y1 + item_height); 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); clutter_actor_allocate (child, &child_alloc, flags);
if (use_animations)
clutter_actor_restore_easing_state (child);
if (priv->orientation == CLUTTER_FLOW_HORIZONTAL) if (priv->orientation == CLUTTER_FLOW_HORIZONTAL)
item_x = new_x; item_x = new_x;
else else