diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-04-23 12:28:23 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2012-04-27 12:30:49 +0100 |
commit | 8cb9725699a2cc26844f1fce06eb3c6a6b218a6a (patch) | |
tree | f3f820754ced402b459f9dd45fd9c3c9261cf51e | |
parent | 78aae84d438587b45ec52d7a28f57e019f04ae23 (diff) | |
download | clutter-8cb9725699a2cc26844f1fce06eb3c6a6b218a6a.tar.gz |
actor: Ignore allocation flags
Allocation flags are informative, and are only meant to be used to
communicate additional information about the allocation process to
an actor.
-rw-r--r-- | clutter/clutter-actor.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 9182fc293..aba7e2778 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -2273,7 +2273,6 @@ clutter_actor_set_allocation_internal (ClutterActor *self, ClutterActorPrivate *priv = self->priv; GObject *obj; gboolean x1_changed, y1_changed, x2_changed, y2_changed; - gboolean flags_changed; gboolean retval; ClutterActorBox old_alloc = { 0, }; @@ -2288,8 +2287,6 @@ clutter_actor_set_allocation_internal (ClutterActor *self, x2_changed = priv->allocation.x2 != box->x2; y2_changed = priv->allocation.y2 != box->y2; - flags_changed = priv->allocation_flags != flags; - priv->allocation = *box; priv->allocation_flags = flags; @@ -2298,9 +2295,10 @@ clutter_actor_set_allocation_internal (ClutterActor *self, priv->needs_height_request = FALSE; priv->needs_allocation = FALSE; - if (x1_changed || y1_changed || - x2_changed || y2_changed || - flags_changed) + if (x1_changed || + y1_changed || + x2_changed || + y2_changed) { CLUTTER_NOTE (LAYOUT, "Allocation for '%s' changed", _clutter_actor_get_debug_name (self)); |