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

property-transition: Lazily convert the interpolated value

Browse Source 
If the Interval used has a different type than the property we are
animating through a PropertyTransition then we should transform the
interpolated value before applying it, to avoid warnings down the
line.
This commit is contained in:
Emmanuele Bassi 2012-06-18 22:21:14 +01:00
parent c57cabd4c2
commit b658023324
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
clutter/clutter-property-transition.c
View File

@ -137,6 +137,7 @@ clutter_property_transition_compute_value (ClutterTransition *transition,
ClutterPropertyTransition *self = CLUTTER_PROPERTY_TRANSITION (transition); ClutterPropertyTransition *self = CLUTTER_PROPERTY_TRANSITION (transition);
ClutterPropertyTransitionPrivate *priv = self->priv; ClutterPropertyTransitionPrivate *priv = self->priv;
GValue value = G_VALUE_INIT; GValue value = G_VALUE_INIT;
GType p_type, i_type;
gboolean res; gboolean res;
/* if we have a GParamSpec we also have an animatable instance */ /* if we have a GParamSpec we also have an animatable instance */
@ -145,7 +146,10 @@ clutter_property_transition_compute_value (ClutterTransition *transition,
clutter_property_transition_ensure_interval (self, animatable, interval); clutter_property_transition_ensure_interval (self, animatable, interval);
g_value_init (&value, clutter_interval_get_value_type (interval)); p_type = G_PARAM_SPEC_VALUE_TYPE (priv->pspec);
i_type = clutter_interval_get_value_type (interval);
g_value_init (&value, i_type);
res = clutter_animatable_interpolate_value (animatable, res = clutter_animatable_interpolate_value (animatable,
priv->property_name, priv->property_name,
@ -154,9 +158,36 @@ clutter_property_transition_compute_value (ClutterTransition *transition,
&value); &value);
if (res) if (res)
{
if (i_type != p_type || g_type_is_a (i_type, p_type))
{
if (g_value_type_transformable (i_type, p_type))
{
GValue transform = G_VALUE_INIT;
g_value_init (&transform, p_type);
if (g_value_transform (&value, &transform))
{
clutter_animatable_set_final_state (animatable,
priv->property_name,
&transform);
}
else
g_warning ("%s: Unable to convert a value of type '%s' from "
"the value type '%s' of the interval.",
G_STRLOC,
g_type_name (p_type),
g_type_name (i_type));
g_value_unset (&transform);
}
}
else
clutter_animatable_set_final_state (animatable, clutter_animatable_set_final_state (animatable,
priv->property_name, priv->property_name,
&value); &value);
}
g_value_unset (&value); g_value_unset (&value);
} }