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

actor: Use internal add/remove child in reparent()

Browse Source 
Do not use the public API; reparent() used to use unparent() and
set_parent(), so we need to maintain the old behaviour.
This commit is contained in:
Emmanuele Bassi 2012-01-20 12:02:49 +00:00
parent 683657cc30
commit c760657903
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clutter/clutter-actor.c
View File

@ -10448,24 +10448,31 @@ clutter_actor_reparent (ClutterActor *self,
g_object_ref (self); g_object_ref (self);
/* go through the Container implementation if this is a regular if (old_parent != NULL)
* child and not an internal one
*/
if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
{ {
ClutterContainer *parent = CLUTTER_CONTAINER (old_parent); /* go through the Container implementation if this is a regular
* child and not an internal one
*/
if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
{
ClutterContainer *parent = CLUTTER_CONTAINER (old_parent);
/* this will have to call unparent() */ /* this will have to call unparent() */
clutter_container_remove_actor (parent, self); clutter_container_remove_actor (parent, self);
}
else
clutter_actor_remove_child_internal (old_parent, self,
REMOVE_CHILD_LEGACY_FLAGS);
} }
else
clutter_actor_remove_child (old_parent, self);
/* Note, will call set_parent() */ /* Note, will call set_parent() */
if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self)) if (!CLUTTER_ACTOR_IS_INTERNAL_CHILD (self))
clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self); clutter_container_add_actor (CLUTTER_CONTAINER (new_parent), self);
else else
clutter_actor_add_child (new_parent, self); clutter_actor_add_child_internal (new_parent, self,
ADD_CHILD_LEGACY_FLAGS,
insert_child_at_depth,
NULL);
/* we emit the ::parent-set signal once */ /* we emit the ::parent-set signal once */
g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent); g_signal_emit (self, actor_signals[PARENT_SET], 0, old_parent);