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

container: Expose create and destroy ChildMeta methods

Browse Source 
It is conceivable that Container implementations might add children
outside of the Container::add() implementation - e.g. for packing at
a specific index. Since the addition (and removal) might happen outside
the common path we need to expose all the API that is implicitly called
by ClutterContainer when adding and removing a child - namely the
ChildMeta creation and destruction.
This commit is contained in:
Emmanuele Bassi 2010-02-25 12:39:24 +00:00
parent 31b5856d69
commit 543e2d3f06
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
clutter/clutter-container.c
View File

@ -93,12 +93,6 @@ static void create_child_meta (ClutterContainer *container,
static void destroy_child_meta (ClutterContainer *container, static void destroy_child_meta (ClutterContainer *container,
ClutterActor *actor); ClutterActor *actor);
static void clutter_container_create_child_meta (ClutterContainer *container,
ClutterActor *actor);
static void clutter_container_destroy_child_meta (ClutterContainer *container,
ClutterActor *actor);
static void static void
clutter_container_base_init (gpointer g_iface) clutter_container_base_init (gpointer g_iface)
{ {
@ -780,7 +774,7 @@ clutter_container_get_child_meta (ClutterContainer *container,
return NULL; return NULL;
} }
/* /**
* clutter_container_create_child_meta: * clutter_container_create_child_meta:
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @actor: a #ClutterActor * @actor: a #ClutterActor
@ -788,12 +782,25 @@ clutter_container_get_child_meta (ClutterContainer *container,
* Creates the #ClutterChildMeta wrapping @actor inside the * Creates the #ClutterChildMeta wrapping @actor inside the
* @container, if the #ClutterContainerIface::child_meta_type * @container, if the #ClutterContainerIface::child_meta_type
* class member is not set to %G_TYPE_INVALID. * class member is not set to %G_TYPE_INVALID.
*
* This function is only useful when adding a #ClutterActor to
* a #ClutterContainer implementation outside of the
* #ClutterContainer::add() virtual function implementation.
*
* Applications should not call this function.
*
* Since: 1.2
*/ */
static void void
clutter_container_create_child_meta (ClutterContainer *container, clutter_container_create_child_meta (ClutterContainer *container,
ClutterActor *actor) ClutterActor *actor)
{ {
ClutterContainerIface *iface = CLUTTER_CONTAINER_GET_IFACE (container); ClutterContainerIface *iface;
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
g_return_if_fail (CLUTTER_IS_ACTOR (container));
iface = CLUTTER_CONTAINER_GET_IFACE (container);
if (iface->child_meta_type == G_TYPE_INVALID) if (iface->child_meta_type == G_TYPE_INVALID)
return; return;
@ -804,19 +811,32 @@ clutter_container_create_child_meta (ClutterContainer *container,
iface->create_child_meta (container, actor); iface->create_child_meta (container, actor);
} }
/* /**
* clutter_container_destroy_child_meta: * clutter_container_destroy_child_meta:
* @container: a #ClutterContainer * @container: a #ClutterContainer
* @actor: a #ClutterActor * @actor: a #ClutterActor
* *
* Destroys the #ClutterChildMeta wrapping @actor inside the * Destroys the #ClutterChildMeta wrapping @actor inside the
* @container, if any. * @container, if any.
*
* This function is only useful when removing a #ClutterActor to
* a #ClutterContainer implementation outside of the
* #ClutterContainer::add() virtual function implementation.
*
* Applications should not call this function.
*
* Since: 1.2
*/ */
static void void
clutter_container_destroy_child_meta (ClutterContainer *container, clutter_container_destroy_child_meta (ClutterContainer *container,
ClutterActor *actor) ClutterActor *actor)
{ {
ClutterContainerIface *iface = CLUTTER_CONTAINER_GET_IFACE (container); ClutterContainerIface *iface;
g_return_if_fail (CLUTTER_IS_CONTAINER (container));
g_return_if_fail (CLUTTER_IS_ACTOR (actor));
iface = CLUTTER_CONTAINER_GET_IFACE (container);
if (iface->child_meta_type == G_TYPE_INVALID) if (iface->child_meta_type == G_TYPE_INVALID)
return; return;

4
clutter/clutter-container.h
View File

@ -169,6 +169,10 @@ GParamSpec * clutter_container_class_find_child_property (GObjectClass
GParamSpec ** clutter_container_class_list_child_properties (GObjectClass *klass, GParamSpec ** clutter_container_class_list_child_properties (GObjectClass *klass,
guint *n_properties); guint *n_properties);
void clutter_container_create_child_meta (ClutterContainer *container,
ClutterActor *actor);
void clutter_container_destroy_child_meta (ClutterContainer *container,
ClutterActor *actor);
ClutterChildMeta *clutter_container_get_child_meta (ClutterContainer *container, ClutterChildMeta *clutter_container_get_child_meta (ClutterContainer *container,
ClutterActor *actor); ClutterActor *actor);

2
doc/reference/clutter/clutter-sections.txt
View File

@ -205,6 +205,8 @@ clutter_container_child_set
clutter_container_child_get clutter_container_child_get
<SUBSECTION> <SUBSECTION>
clutter_container_create_child_meta
clutter_container_destroy_child_meta
clutter_container_get_child_meta clutter_container_get_child_meta
<SUBSECTION Standard> <SUBSECTION Standard>