isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 16:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Ignore allocation flags

Browse Source 
Allocation flags are informative, and are only meant to be used to
communicate additional information about the allocation process to
an actor.
This commit is contained in:
Emmanuele Bassi 2012-04-23 12:28:23 +01:00
parent 78aae84d43
commit 8cb9725699
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-actor.c
View File

@ -2273,7 +2273,6 @@ clutter_actor_set_allocation_internal (ClutterActor *self,
ClutterActorPrivate *priv = self->priv; ClutterActorPrivate *priv = self->priv;
GObject *obj; GObject *obj;
gboolean x1_changed, y1_changed, x2_changed, y2_changed; gboolean x1_changed, y1_changed, x2_changed, y2_changed;
gboolean flags_changed;
gboolean retval; gboolean retval;
ClutterActorBox old_alloc = { 0, }; ClutterActorBox old_alloc = { 0, };
@ -2288,8 +2287,6 @@ clutter_actor_set_allocation_internal (ClutterActor *self,
x2_changed = priv->allocation.x2 != box->x2; x2_changed = priv->allocation.x2 != box->x2;
y2_changed = priv->allocation.y2 != box->y2; y2_changed = priv->allocation.y2 != box->y2;
flags_changed = priv->allocation_flags != flags;
priv->allocation = *box; priv->allocation = *box;
priv->allocation_flags = flags; priv->allocation_flags = flags;
@ -2298,9 +2295,10 @@ clutter_actor_set_allocation_internal (ClutterActor *self,
priv->needs_height_request = FALSE; priv->needs_height_request = FALSE;
priv->needs_allocation = FALSE; priv->needs_allocation = FALSE;
if (x1_changed || y1_changed || if (x1_changed ||
x2_changed || y2_changed || y1_changed ||
flags_changed) x2_changed ||
y2_changed)
{ {
CLUTTER_NOTE (LAYOUT, "Allocation for '%s' changed", CLUTTER_NOTE (LAYOUT, "Allocation for '%s' changed",
_clutter_actor_get_debug_name (self)); _clutter_actor_get_debug_name (self));