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

behaviour: Implement the implicit alpha parsing

Browse Source 
ClutterBehaviour should implement the Scriptable interface
and parse ClutterAlpha when implicitly defined, instead of
having this ad hoc code inside ClutterScriptParser itself.

After all, only ClutterBehaviour supports Alpha defined
implicitly.
This commit is contained in:
Emmanuele Bassi
2009-11-06 11:33:32 +00:00
parent f1ed8be066
commit cb60c038ac
3 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
clutter/clutter-script-parser.c
View File

@ -816,8 +816,8 @@ resolve_alpha_func (const gchar *name)
}
GObject *
clutter_script_parse_alpha (ClutterScript *script,
JsonNode *node)
_clutter_script_parse_alpha (ClutterScript *script,
JsonNode *node)
{
GObject *retval = NULL;
JsonObject *object;
@ -1068,21 +1068,6 @@ clutter_script_parse_node (ClutterScript *script,
if (g_type_is_a (p_type, G_TYPE_OBJECT))
{
/* ClutterAlpha are handled a little bit
* differently, since they can be implicit
*/
if (g_type_is_a (p_type, CLUTTER_TYPE_ALPHA))
{
GObject *alpha;
alpha = clutter_script_parse_alpha (script, node);
if (alpha)
{
g_value_set_object (value, alpha);
return TRUE;
}
}
/* default GObject handling: we get the id and
* retrieve the ObjectInfo for it; since the object
* definitions are parsed leaf-first we are guaranteed