isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-22 19:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

2007-01-19 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
Allow the ClutterGroup subclasses to override the add and
	remove operations.

	* clutter/clutter-group.c: Move the add and remove code from
	clutter_group_add() and clutter_group_remove() to the signal
	class closures; make the "add" and "remove" signals as
	RUN_FIRST.
This commit is contained in:
Emmanuele Bassi 2007-01-19 17:56:35 +00:00
parent f924e2bbf7
commit ee6b583ec1
2 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2007-01-19 Emmanuele Bassi <ebassi@openedhand.com>
Allow the ClutterGroup subclasses to override the add and
remove operations.
* clutter/clutter-group.c: Move the add and remove code from
clutter_group_add() and clutter_group_remove() to the signal
class closures; make the "add" and "remove" signals as
RUN_FIRST.
2007-01-19 Tomas Frydrych <tf@openedhand.com> 2007-01-19 Tomas Frydrych <tf@openedhand.com>
* clutter/clutter-fixed.h.: * clutter/clutter-fixed.h.:

76
clutter/clutter-group.c
View File

@ -176,6 +176,36 @@ clutter_group_real_hide_all (ClutterActor *actor)
NULL); NULL);
} }
static void
clutter_group_real_add (ClutterGroup *group,
ClutterActor *actor)
{
g_object_ref (actor);
group->priv->children = g_list_append (group->priv->children, actor);
clutter_actor_set_parent (actor, CLUTTER_ACTOR (group));
clutter_group_sort_depth_order (group);
g_object_unref (actor);
}
static void
clutter_group_real_remove (ClutterGroup *group,
ClutterActor *actor)
{
g_object_ref (actor);
group->priv->children = g_list_remove (group->priv->children, actor);
clutter_actor_unparent (actor);
if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (group)))
clutter_actor_queue_redraw (CLUTTER_ACTOR (group));
g_object_unref (actor);
}
static void static void
clutter_group_class_init (ClutterGroupClass *klass) clutter_group_class_init (ClutterGroupClass *klass)
{ {
@ -195,7 +225,7 @@ clutter_group_class_init (ClutterGroupClass *klass)
group_signals[ADD] = group_signals[ADD] =
g_signal_new ("add", g_signal_new ("add",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterGroupClass, add), G_STRUCT_OFFSET (ClutterGroupClass, add),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, clutter_marshal_VOID__OBJECT,
@ -205,13 +235,16 @@ clutter_group_class_init (ClutterGroupClass *klass)
group_signals[REMOVE] = group_signals[REMOVE] =
g_signal_new ("remove", g_signal_new ("remove",
G_OBJECT_CLASS_TYPE (object_class), G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ClutterGroupClass, remove), G_STRUCT_OFFSET (ClutterGroupClass, remove),
NULL, NULL, NULL, NULL,
clutter_marshal_VOID__OBJECT, clutter_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR); CLUTTER_TYPE_ACTOR);
klass->add = clutter_group_real_add;
klass->remove = clutter_group_real_remove;
g_type_class_add_private (object_class, sizeof (ClutterGroupPrivate)); g_type_class_add_private (object_class, sizeof (ClutterGroupPrivate));
} }
@ -367,8 +400,6 @@ clutter_group_add (ClutterGroup *self,
{ {
ClutterActor *parent; ClutterActor *parent;
/* FIXME: add() needs to be somehow overidden */
g_return_if_fail (CLUTTER_IS_GROUP (self)); g_return_if_fail (CLUTTER_IS_GROUP (self));
g_return_if_fail (CLUTTER_IS_ACTOR (actor)); g_return_if_fail (CLUTTER_IS_ACTOR (actor));
@ -384,16 +415,7 @@ clutter_group_add (ClutterGroup *self,
return; return;
} }
g_object_ref (actor);
self->priv->children = g_list_append (self->priv->children, actor);
clutter_actor_set_parent (actor, CLUTTER_ACTOR (self));
clutter_group_sort_depth_order (self);
g_signal_emit (self, group_signals[ADD], 0, actor); g_signal_emit (self, group_signals[ADD], 0, actor);
g_object_unref (actor);
} }
/** /**
@ -471,17 +493,7 @@ clutter_group_remove (ClutterGroup *self,
return; return;
} }
g_object_ref (actor);
self->priv->children = g_list_remove (self->priv->children, actor);
clutter_actor_unparent (actor);
g_signal_emit (self, group_signals[REMOVE], 0, actor); g_signal_emit (self, group_signals[REMOVE], 0, actor);
if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (self)))
clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
g_object_unref (actor);
} }
/** /**
@ -493,19 +505,15 @@ clutter_group_remove (ClutterGroup *self,
void void
clutter_group_remove_all (ClutterGroup *self) clutter_group_remove_all (ClutterGroup *self)
{ {
GList *child_item; GList *l;
g_return_if_fail (CLUTTER_IS_GROUP (self)); g_return_if_fail (CLUTTER_IS_GROUP (self));
child_item = self->priv->children; for (l = self->priv->children; l != NULL; l = l->next)
if (child_item)
{ {
do ClutterActor *child = l->data;
{
clutter_group_remove (self, CLUTTER_ACTOR(child_item->data)); clutter_group_remove (self, child);
}
while ((child_item = g_list_next(child_item)) != NULL);
} }
} }
@ -602,7 +610,7 @@ clutter_group_raise (ClutterGroup *self,
*/ */
if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor)) if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor))
clutter_actor_set_depth (actor, clutter_actor_set_depth (actor,
clutter_actor_get_depth(sibling)); clutter_actor_get_depth(sibling));
} }
@ -645,7 +653,7 @@ clutter_group_lower (ClutterGroup *self,
/* See comment in group_raise for this */ /* See comment in group_raise for this */
if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor)) if (clutter_actor_get_depth(sibling) != clutter_actor_get_depth(actor))
clutter_actor_set_depth (actor, clutter_actor_set_depth (actor,
clutter_actor_get_depth(sibling)); clutter_actor_get_depth(sibling));
} }
static gint static gint