sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

actor: Clean up the allocate() checks

Browse source 
Move the conditions to their own boolean flags, to avoid making the
if() incomprehensible.
This commit is contained in:
Emmanuele Bassi 2011-07-19 14:03:02 +01:00
parent 48a2b3a654
commit e1327f5591
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
clutter/clutter-actor.c
View file

@ -6154,7 +6154,7 @@ clutter_actor_allocate (ClutterActor *self,
ClutterActorPrivate *priv; ClutterActorPrivate *priv;
ClutterActorClass *klass; ClutterActorClass *klass;
ClutterActorBox alloc; ClutterActorBox alloc;
gboolean child_moved; gboolean origin_changed, child_moved, size_changed;
gboolean stage_allocation_changed; gboolean stage_allocation_changed;
g_return_if_fail (CLUTTER_IS_ACTOR (self)); g_return_if_fail (CLUTTER_IS_ACTOR (self));
@ -6185,13 +6185,15 @@ clutter_actor_allocate (ClutterActor *self,
} }
} }
origin_changed = (flags & CLUTTER_ABSOLUTE_ORIGIN_CHANGED);
child_moved = (alloc.x1 != priv->allocation.x1 || child_moved = (alloc.x1 != priv->allocation.x1 ||
alloc.y1 != priv->allocation.y1); alloc.y1 != priv->allocation.y1);
if (flags & CLUTTER_ABSOLUTE_ORIGIN_CHANGED || size_changed = (alloc.x2 != priv->allocation.x2 ||
child_moved || alloc.y2 != priv->allocation.y2);
alloc.x2 != priv->allocation.x2 ||
alloc.y2 != priv->allocation.y2) if (origin_changed || child_moved || size_changed)
stage_allocation_changed = TRUE; stage_allocation_changed = TRUE;
else else
stage_allocation_changed = FALSE; stage_allocation_changed = FALSE;