isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 14:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

cally: Use Actor.get_children()

Browse Source 
Instead of the Container method, given that the new get_children() gives
us more actors by default.
This commit is contained in:
Emmanuele Bassi 2011-12-20 14:56:54 +00:00 committed by Emmanuele Bassi
parent b42f17b2dc
commit 1979faee00
1 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
clutter/cally/cally-actor.c
View File

@ -295,36 +295,27 @@ cally_actor_initialize (AtkObject *obj,
g_object_set_data (G_OBJECT (obj), "atk-component-layer", g_object_set_data (G_OBJECT (obj), "atk-component-layer",
GINT_TO_POINTER (ATK_LAYER_MDI)); GINT_TO_POINTER (ATK_LAYER_MDI));
/* Depends if the object implement ClutterContainer */ priv->children = clutter_actor_get_children (actor);
if (CLUTTER_IS_CONTAINER(actor))
{
priv->children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
/* /*
* We store the handler ids for these signals in case some objects * We store the handler ids for these signals in case some objects
* need to remove these handlers. * need to remove these handlers.
*/ */
handler_id = g_signal_connect (actor, handler_id = g_signal_connect (actor,
"actor-added", "actor-added",
G_CALLBACK (cally_actor_add_actor), G_CALLBACK (cally_actor_add_actor),
obj); obj);
g_object_set_data (G_OBJECT (obj), "cally-add-handler-id", g_object_set_data (G_OBJECT (obj), "cally-add-handler-id",
GUINT_TO_POINTER (handler_id)); GUINT_TO_POINTER (handler_id));
handler_id = g_signal_connect (actor, handler_id = g_signal_connect (actor,
"actor-removed", "actor-removed",
G_CALLBACK (cally_actor_remove_actor), G_CALLBACK (cally_actor_remove_actor),
obj); obj);
g_object_set_data (G_OBJECT (obj), "cally-remove-handler-id", g_object_set_data (G_OBJECT (obj), "cally-remove-handler-id",
GUINT_TO_POINTER (handler_id)); GUINT_TO_POINTER (handler_id));
obj->role = ATK_ROLE_PANEL; /* typically objects implementing ClutterContainer obj->role = ATK_ROLE_PANEL; /* typically objects implementing ClutterContainer
interface would be a panel */ interface would be a panel */
}
else
{
priv->children = NULL;
obj->role = ATK_ROLE_UNKNOWN;
}
} }
static void static void
@ -658,8 +649,8 @@ cally_actor_remove_actor (ClutterActor *container,
static gint static gint
cally_actor_real_add_actor (ClutterActor *container, cally_actor_real_add_actor (ClutterActor *container,
ClutterActor *actor, ClutterActor *actor,
gpointer data) gpointer data)
{ {
AtkObject *atk_parent = ATK_OBJECT (data); AtkObject *atk_parent = ATK_OBJECT (data);
AtkObject *atk_child = clutter_actor_get_accessible (actor); AtkObject *atk_child = clutter_actor_get_accessible (actor);
@ -674,8 +665,7 @@ cally_actor_real_add_actor (ClutterActor *container,
g_list_free (priv->children); g_list_free (priv->children);
priv->children = priv->children = clutter_actor_get_children (CLUTTER_ACTOR (container));
clutter_container_get_children (CLUTTER_CONTAINER(container));
index = g_list_index (priv->children, actor); index = g_list_index (priv->children, actor);
g_signal_emit_by_name (atk_parent, "children_changed::add", g_signal_emit_by_name (atk_parent, "children_changed::add",
@ -686,8 +676,8 @@ cally_actor_real_add_actor (ClutterActor *container,
static gint static gint
cally_actor_real_remove_actor (ClutterActor *container, cally_actor_real_remove_actor (ClutterActor *container,
ClutterActor *actor, ClutterActor *actor,
gpointer data) gpointer data)
{ {
AtkPropertyValues values = { NULL }; AtkPropertyValues values = { NULL };
AtkObject* atk_parent = NULL; AtkObject* atk_parent = NULL;
@ -717,7 +707,8 @@ cally_actor_real_remove_actor (ClutterActor *container,
priv = CALLY_ACTOR (atk_parent)->priv; priv = CALLY_ACTOR (atk_parent)->priv;
index = g_list_index (priv->children, actor); index = g_list_index (priv->children, actor);
g_list_free (priv->children); g_list_free (priv->children);
priv->children = clutter_container_get_children (CLUTTER_CONTAINER(container));
priv->children = clutter_actor_get_children (CLUTTER_ACTOR (container));
if (index >= 0 && index <= g_list_length (priv->children)) if (index >= 0 && index <= g_list_length (priv->children))
g_signal_emit_by_name (atk_parent, "children_changed::remove", g_signal_emit_by_name (atk_parent, "children_changed::remove",