isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-22 18:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

grid-layout: Remove layout animations

Browse Source 
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:11:13 +01:00
parent 5a1c16de62
commit 2fef1a174e
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/clutter-grid-layout.c
View File

@ -1388,9 +1388,6 @@ clutter_grid_layout_allocate (ClutterLayoutManager *layout,
ClutterGridLines *lines; ClutterGridLines *lines;
ClutterActorIter iter; ClutterActorIter iter;
ClutterActor *child; ClutterActor *child;
gboolean use_animations;
ClutterAnimationMode mode;
guint duration, delay;
request.grid = self; request.grid = self;
@ -1411,11 +1408,6 @@ clutter_grid_layout_allocate (ClutterLayoutManager *layout,
clutter_grid_request_position (&request, 0); clutter_grid_request_position (&request, 0);
clutter_grid_request_position (&request, 1); 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)); clutter_actor_iter_init (&iter, CLUTTER_ACTOR (container));
while (clutter_actor_iter_next (&iter, &child)) while (clutter_actor_iter_next (&iter, &child))
{ {
@ -1440,18 +1432,7 @@ clutter_grid_layout_allocate (ClutterLayoutManager *layout,
_clutter_actor_get_debug_name (child), _clutter_actor_get_debug_name (child),
x, y, width, height); 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); clutter_actor_allocate (child, &child_allocation, flags);
if (use_animations)
clutter_actor_restore_easing_state (child);
} }
} }