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

script: Separate construction from properties application

Browse Source 
Currently, ClutterScriptParser will construct the object (using the
construct-only and construct parameters), apply the properties from
the ClutterScript definition, and eventuall will add children and
behaviours.

The construction phase should be more compartimentalized: the objects
should be constructed first and eventual children and behaviours
added. Then, once an object is requested or when the parsing process
has terminated, all the properties should be applied.

This change allows us to set up the actors before setting their
non-construct properties.
This commit is contained in:
Emmanuele Bassi
2009-11-04 14:05:13 +00:00
parent 31e5dadb68
commit 4df59d330c
3 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/clutter-script.c
View File

@ -586,7 +586,10 @@ clutter_script_get_object (ClutterScript *script,
if (!oinfo)
return NULL;
return _clutter_script_construct_object (script, oinfo);
_clutter_script_construct_object (script, oinfo);
_clutter_script_apply_properties (script, oinfo);
return oinfo->object;
}
static gint
@ -732,8 +735,20 @@ construct_each_objects (gpointer key,
ClutterScript *script = user_data;
ObjectInfo *oinfo = value;
/* we have unfinished business */
if (oinfo->has_unresolved)
oinfo->object = _clutter_script_construct_object (script, oinfo);
{
/* this should not happen, but resilence is
* a good thing in a parser
*/
if (oinfo->object == NULL)
_clutter_script_construct_object (script, oinfo);
/* this will take care of setting up properties,
* adding children and applying behaviours
*/
_clutter_script_apply_properties (script, oinfo);
}
}
/**
@ -920,8 +935,7 @@ connect_each_object (gpointer key,
GObject *object = oinfo->object;
GList *unresolved, *l;
if (G_UNLIKELY (!oinfo->object))
oinfo->object = _clutter_script_construct_object (script, oinfo);
_clutter_script_construct_object (script, oinfo);
unresolved = NULL;
for (l = oinfo->signals; l != NULL; l = l->next)