isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

animator: Add a :timeline property

Browse Source 
It would be useful to be able to share the Timeline across different
animator instances, or with different animation constructs. Also this
allows sharing definitions of Timelines in ClutterScript.
This commit is contained in:
Emmanuele Bassi 2010-02-25 14:08:57 +00:00
parent 6415825339
commit c291d5a660
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
clutter/clutter-animator.c
View File

@ -160,7 +160,8 @@ enum
{ {
PROP_0, PROP_0,
PROP_DURATION PROP_DURATION,
PROP_TIMELINE
}; };
static void clutter_scriptable_init (ClutterScriptableIface *iface); static void clutter_scriptable_init (ClutterScriptableIface *iface);
@ -1630,6 +1631,10 @@ clutter_animator_set_property (GObject *gobject,
clutter_animator_set_duration (self, g_value_get_uint (value)); clutter_animator_set_duration (self, g_value_get_uint (value));
break; break;
case PROP_TIMELINE:
clutter_animator_set_timeline (self, g_value_get_object (value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -1650,6 +1655,10 @@ clutter_animator_get_property (GObject *gobject,
g_value_set_uint (value, clutter_timeline_get_duration (priv->timeline)); g_value_set_uint (value, clutter_timeline_get_duration (priv->timeline));
break; break;
case PROP_TIMELINE:
g_value_set_object (value, priv->timeline);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -1683,6 +1692,21 @@ clutter_animator_class_init (ClutterAnimatorClass *klass)
2000, 2000,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_DURATION, pspec); g_object_class_install_property (gobject_class, PROP_DURATION, pspec);
/**
* ClutterAnimator:timeline:
*
* The #ClutterTimeline used by the #ClutterAnimator to drive the
* animation
*
* Since: 1.2
*/
pspec = g_param_spec_object ("timeline",
"Timeline",
"The timeline of the animation",
CLUTTER_TYPE_TIMELINE,
CLUTTER_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TIMELINE, pspec);
} }
static void static void