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

actor: Ensure static scope to allocation-changed arguments

Browse Source 
In theory, handlers connected to the ::allocation-changed signal may be
able to modify the actor's real allocation and allocation flags,
especially now that we use STATIC_SCOPE; let's avoid this, so that we
don't regret it later.
This commit is contained in:
Emmanuele Bassi 2012-03-05 21:59:53 +00:00
parent 762e0de2c6
commit 155f7741fe
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/clutter-actor.c
View File

@ -2113,9 +2113,14 @@ clutter_actor_real_allocate (ClutterActor *self,
clutter_actor_maybe_layout_children (self, box, flags); clutter_actor_maybe_layout_children (self, box, flags);
if (changed) if (changed)
g_signal_emit (self, actor_signals[ALLOCATION_CHANGED], 0, {
&priv->allocation, ClutterActorBox signal_box = priv->allocation;
priv->allocation_flags); ClutterAllocationFlags signal_flags = priv->allocation_flags;
g_signal_emit (self, actor_signals[ALLOCATION_CHANGED], 0,
&signal_box,
signal_flags);
}
g_object_thaw_notify (G_OBJECT (self)); g_object_thaw_notify (G_OBJECT (self));
} }
@ -7981,9 +7986,14 @@ clutter_actor_set_allocation (ClutterActor *self,
clutter_actor_maybe_layout_children (self, box, flags); clutter_actor_maybe_layout_children (self, box, flags);
if (changed) if (changed)
g_signal_emit (self, actor_signals[ALLOCATION_CHANGED], 0, {
&priv->allocation, ClutterActorBox signal_box = priv->allocation;
priv->allocation_flags); ClutterAllocationFlags signal_flags = priv->allocation_flags;
g_signal_emit (self, actor_signals[ALLOCATION_CHANGED], 0,
&signal_box,
signal_flags);
}
g_object_thaw_notify (G_OBJECT (self)); g_object_thaw_notify (G_OBJECT (self));
} }