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

actor: Cosmetic fixes to internal add/remove child

Browse Source 
Avoid code duplication all over the place.
This commit is contained in:
Emmanuele Bassi 2011-12-02 16:16:26 +00:00 committed by Emmanuele Bassi
parent 24a451b388
commit 7d88a70b78
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
clutter/clutter-actor.c
View File

@ -9126,7 +9126,9 @@ static void
clutter_actor_add_child_internal (ClutterActor *self, clutter_actor_add_child_internal (ClutterActor *self,
ClutterActor *child, ClutterActor *child,
ClutterActorAddChildFunc add_func, ClutterActorAddChildFunc add_func,
gpointer data) gpointer data,
gboolean create_meta,
gboolean emit_signal)
{ {
ClutterTextDirection text_dir; ClutterTextDirection text_dir;
@ -9149,6 +9151,9 @@ clutter_actor_add_child_internal (ClutterActor *self,
return; return;
} }
if (create_meta)
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
g_object_ref_sink (child); g_object_ref_sink (child);
child->priv->parent_actor = self; child->priv->parent_actor = self;
@ -9215,6 +9220,9 @@ clutter_actor_add_child_internal (ClutterActor *self,
{ {
clutter_actor_queue_compute_expand (self); clutter_actor_queue_compute_expand (self);
} }
if (emit_signal)
g_signal_emit_by_name (self, "actor-added", child);
} }
/** /**
@ -9243,11 +9251,11 @@ clutter_actor_add_child (ClutterActor *self,
g_return_if_fail (self != child); g_return_if_fail (self != child);
g_return_if_fail (child->priv->parent_actor == NULL); g_return_if_fail (child->priv->parent_actor == NULL);
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
clutter_actor_add_child_internal (self, child, clutter_actor_add_child_internal (self, child,
insert_child_at_depth, insert_child_at_depth,
NULL); NULL,
g_signal_emit_by_name (self, "actor-added", child); TRUE, /* create_meta */
TRUE /* emit_signals */);
} }
/** /**
@ -9280,11 +9288,11 @@ clutter_actor_insert_child_at_index (ClutterActor *self,
g_return_if_fail (child->priv->parent_actor == NULL); g_return_if_fail (child->priv->parent_actor == NULL);
g_return_if_fail (index_ < self->priv->n_children); g_return_if_fail (index_ < self->priv->n_children);
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
clutter_actor_add_child_internal (self, child, clutter_actor_add_child_internal (self, child,
insert_child_at_index, insert_child_at_index,
GINT_TO_POINTER (index_)); GINT_TO_POINTER (index_),
g_signal_emit_by_name (self, "actor-added", child); TRUE,
TRUE);
} }
/** /**
@ -9321,11 +9329,11 @@ clutter_actor_insert_child_above (ClutterActor *self,
(CLUTTER_IS_ACTOR (sibling) && (CLUTTER_IS_ACTOR (sibling) &&
sibling->priv->parent_actor == self)); sibling->priv->parent_actor == self));
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
clutter_actor_add_child_internal (self, child, clutter_actor_add_child_internal (self, child,
insert_child_above, insert_child_above,
sibling); sibling,
g_signal_emit_by_name (self, "actor-added", child); TRUE,
TRUE);
} }
/** /**
@ -9362,11 +9370,11 @@ clutter_actor_insert_child_below (ClutterActor *self,
(CLUTTER_IS_ACTOR (sibling) && (CLUTTER_IS_ACTOR (sibling) &&
sibling->priv->parent_actor == self)); sibling->priv->parent_actor == self));
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
clutter_actor_add_child_internal (self, child, clutter_actor_add_child_internal (self, child,
insert_child_below, insert_child_below,
sibling); sibling,
g_signal_emit_by_name (self, "actor-added", child); TRUE,
TRUE);
} }
/** /**
@ -9396,7 +9404,9 @@ clutter_actor_set_parent (ClutterActor *self,
clutter_actor_add_child_internal (parent, self, clutter_actor_add_child_internal (parent, self,
insert_child_at_depth, insert_child_at_depth,
NULL); NULL,
FALSE,
FALSE);
} }
/** /**
@ -9455,10 +9465,15 @@ invalidate_queue_redraw_entry (ClutterActor *self,
static void static void
clutter_actor_remove_child_internal (ClutterActor *self, clutter_actor_remove_child_internal (ClutterActor *self,
ClutterActor *child) ClutterActor *child,
gboolean destroy_meta,
gboolean emit_signal)
{ {
gboolean was_mapped; gboolean was_mapped;
if (destroy_meta)
clutter_container_destroy_child_meta (CLUTTER_CONTAINER (self), child);
was_mapped = CLUTTER_ACTOR_IS_MAPPED (child); was_mapped = CLUTTER_ACTOR_IS_MAPPED (child);
/* we need to unrealize *before* we set parent_actor to NULL, /* we need to unrealize *before* we set parent_actor to NULL,
@ -9514,6 +9529,10 @@ clutter_actor_remove_child_internal (ClutterActor *self,
clutter_actor_queue_compute_expand (self); clutter_actor_queue_compute_expand (self);
} }
/* we need to emit the signal before dropping the reference */
if (emit_signal)
g_signal_emit_by_name (self, "actor-removed", child);
/* remove the reference we acquired in clutter_actor_add_child() */ /* remove the reference we acquired in clutter_actor_add_child() */
g_object_unref (child); g_object_unref (child);
} }
@ -9545,15 +9564,7 @@ clutter_actor_remove_child (ClutterActor *self,
g_return_if_fail (child->priv->parent_actor != NULL); g_return_if_fail (child->priv->parent_actor != NULL);
g_return_if_fail (child->priv->parent_actor == self); g_return_if_fail (child->priv->parent_actor == self);
g_object_ref (child); clutter_actor_remove_child_internal (self, child, TRUE, TRUE);
clutter_container_destroy_child_meta (CLUTTER_CONTAINER (self), child);
clutter_actor_remove_child_internal (self, child);
g_signal_emit_by_name (self, "actor-removed", child);
g_object_unref (child);
} }
/** /**
@ -9582,7 +9593,9 @@ clutter_actor_unparent (ClutterActor *self)
if (self->priv->parent_actor == NULL) if (self->priv->parent_actor == NULL)
return; return;
clutter_actor_remove_child_internal (self->priv->parent_actor, self); clutter_actor_remove_child_internal (self->priv->parent_actor, self,
FALSE,
FALSE);
} }
/** /**