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

actor: Add freeze/thaw when changing the first/last child

Browse Source 
This should improve performance when adding/removing lots
of children.
This commit is contained in:
Jasper St. Pierre 2012-02-13 22:40:15 -05:00
parent cf735b54df
commit 0f5ddb6d6c
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clutter/clutter-actor.c
View File

@ -3491,6 +3491,8 @@ clutter_actor_remove_child_internal (ClutterActor *self,
flush_queue = (flags & REMOVE_CHILD_FLUSH_QUEUE) != 0; flush_queue = (flags & REMOVE_CHILD_FLUSH_QUEUE) != 0;
notify_first_last = (flags & REMOVE_CHILD_NOTIFY_FIRST_LAST) != 0; notify_first_last = (flags & REMOVE_CHILD_NOTIFY_FIRST_LAST) != 0;
g_object_freeze_notify (G_OBJECT (self));
if (destroy_meta) if (destroy_meta)
clutter_container_destroy_child_meta (CLUTTER_CONTAINER (self), child); clutter_container_destroy_child_meta (CLUTTER_CONTAINER (self), child);
@ -3564,6 +3566,8 @@ clutter_actor_remove_child_internal (ClutterActor *self,
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAST_CHILD]); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAST_CHILD]);
} }
g_object_thaw_notify (G_OBJECT (self));
/* 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);
} }
@ -10124,6 +10128,8 @@ clutter_actor_add_child_internal (ClutterActor *self,
old_first_child = self->priv->first_child; old_first_child = self->priv->first_child;
old_last_child = self->priv->last_child; old_last_child = self->priv->last_child;
g_object_freeze_notify (G_OBJECT (self));
if (create_meta) if (create_meta)
clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child); clutter_container_create_child_meta (CLUTTER_CONTAINER (self), child);
@ -10198,6 +10204,8 @@ clutter_actor_add_child_internal (ClutterActor *self,
if (old_last_child != self->priv->last_child) if (old_last_child != self->priv->last_child)
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAST_CHILD]); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LAST_CHILD]);
} }
g_object_thaw_notify (G_OBJECT (self));
} }
/** /**
@ -10483,10 +10491,14 @@ clutter_actor_remove_all_children (ClutterActor *self)
if (self->priv->n_children == 0) if (self->priv->n_children == 0)
return; return;
g_object_freeze_notify (G_OBJECT (self));
clutter_actor_iter_init (&iter, self); clutter_actor_iter_init (&iter, self);
while (clutter_actor_iter_next (&iter, NULL)) while (clutter_actor_iter_next (&iter, NULL))
clutter_actor_iter_remove (&iter); clutter_actor_iter_remove (&iter);
g_object_thaw_notify (G_OBJECT (self));
/* sanity check */ /* sanity check */
g_assert (self->priv->first_child == NULL); g_assert (self->priv->first_child == NULL);
g_assert (self->priv->last_child == NULL); g_assert (self->priv->last_child == NULL);
@ -10530,10 +10542,14 @@ clutter_actor_destroy_all_children (ClutterActor *self)
if (self->priv->n_children == 0) if (self->priv->n_children == 0)
return; return;
g_object_freeze_notify (G_OBJECT (self));
clutter_actor_iter_init (&iter, self); clutter_actor_iter_init (&iter, self);
while (clutter_actor_iter_next (&iter, NULL)) while (clutter_actor_iter_next (&iter, NULL))
clutter_actor_iter_destroy (&iter); clutter_actor_iter_destroy (&iter);
g_object_thaw_notify (G_OBJECT (self));
/* sanity check */ /* sanity check */
g_assert (self->priv->first_child == NULL); g_assert (self->priv->first_child == NULL);
g_assert (self->priv->last_child == NULL); g_assert (self->priv->last_child == NULL);