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

actor: Use the internal child list for map/unmap

Browse Source 
Use the internal child list for the default map/unmap vfuncs. This removes
the requirement for non-container composite actors to implement their own
map/unmap functions.
This commit is contained in:
Chris Lord 2010-10-26 17:09:24 +01:00
parent 4752cc38b2
commit 186d5698ce
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/clutter-actor.c
View File

@ -1031,6 +1031,8 @@ clutter_actor_update_map_state (ClutterActor *self,
static void static void
clutter_actor_real_map (ClutterActor *self) clutter_actor_real_map (ClutterActor *self)
{ {
GList *c;
g_assert (!CLUTTER_ACTOR_IS_MAPPED (self)); g_assert (!CLUTTER_ACTOR_IS_MAPPED (self));
CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED); CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
@ -1040,10 +1042,11 @@ clutter_actor_real_map (ClutterActor *self)
*/ */
_clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]); _clutter_notify_by_pspec (G_OBJECT (self), obj_props[PROP_MAPPED]);
if (CLUTTER_IS_CONTAINER (self)) for (c = self->priv->children; c; c = c->next)
clutter_container_foreach_with_internals (CLUTTER_CONTAINER (self), {
CLUTTER_CALLBACK (clutter_actor_map), ClutterActor *child = c->data;
NULL); clutter_actor_map (child);
}
} }
/** /**
@ -1082,12 +1085,15 @@ clutter_actor_map (ClutterActor *self)
static void static void
clutter_actor_real_unmap (ClutterActor *self) clutter_actor_real_unmap (ClutterActor *self)
{ {
GList *c;
g_assert (CLUTTER_ACTOR_IS_MAPPED (self)); g_assert (CLUTTER_ACTOR_IS_MAPPED (self));
if (CLUTTER_IS_CONTAINER (self)) for (c = self->priv->children; c; c = c->next)
clutter_container_foreach_with_internals (CLUTTER_CONTAINER (self), {
CLUTTER_CALLBACK (clutter_actor_unmap), ClutterActor *child = c->data;
NULL); clutter_actor_unmap (child);
}
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_MAPPED); CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_MAPPED);