isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-25 20:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting the mode on a ClutterAlpha created with animation_set_alpha(NULL)

Browse Source 
It previously attempted to set the mode on the alpha using
clutter_animation_set_mode_internal, but this was setting the mode on
priv->alpha. At that point in the code priv->alpha is always NULL.

clutter_animation_set_mode_internal now takes a parameter to specify
which alpha to modify.
This commit is contained in:
Neil Roberts 2009-01-05 12:52:46 +00:00
parent 2ed60a5270
commit 62cfc6487f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clutter/clutter-animation.c
View File

@ -780,12 +780,11 @@ clutter_animation_get_actor (ClutterAnimation *animation)
} }
static inline void static inline void
clutter_animation_set_mode_internal (ClutterAnimation *animation) clutter_animation_set_mode_internal (ClutterAnimation *animation,
ClutterAlpha *alpha)
{ {
ClutterAnimationPrivate *priv = animation->priv; ClutterAnimationPrivate *priv = animation->priv;
ClutterAlpha *alpha;
alpha = clutter_animation_get_alpha (animation);
if (alpha) if (alpha)
clutter_alpha_set_mode (alpha, priv->mode); clutter_alpha_set_mode (alpha, priv->mode);
} }
@ -810,7 +809,7 @@ clutter_animation_set_mode (ClutterAnimation *animation,
priv = animation->priv; priv = animation->priv;
priv->mode = mode; priv->mode = mode;
clutter_animation_set_mode_internal (animation); clutter_animation_set_mode_internal (animation, priv->alpha);
g_object_notify (G_OBJECT (animation), "mode"); g_object_notify (G_OBJECT (animation), "mode");
} }
@ -1066,7 +1065,7 @@ clutter_animation_set_alpha (ClutterAnimation *animation,
alpha = clutter_alpha_new (); alpha = clutter_alpha_new ();
clutter_alpha_set_timeline (alpha, timeline); clutter_alpha_set_timeline (alpha, timeline);
clutter_animation_set_mode_internal (animation); clutter_animation_set_mode_internal (animation, alpha);
} }
priv->alpha = g_object_ref_sink (alpha); priv->alpha = g_object_ref_sink (alpha);