mirror of
https://github.com/brl/mutter.git
synced 2025-04-01 16:13:46 +00:00
In clutter_alpha_set_mode, set priv->mode after setting the func
Otherwise the call to clutter_alpha_set_func sets the mode back to CLUTTER_CUSTOM_MODE so clutter_alpha_get_mode won't get back the same value that was set.
This commit is contained in:
parent
fd2d78918b
commit
2ed60a5270
@ -565,13 +565,13 @@ clutter_alpha_set_mode (ClutterAlpha *alpha,
|
|||||||
|
|
||||||
priv = alpha->priv;
|
priv = alpha->priv;
|
||||||
|
|
||||||
priv->mode = mode;
|
|
||||||
|
|
||||||
/* sanity check to avoid getting an out of sync enum/function mapping */
|
/* sanity check to avoid getting an out of sync enum/function mapping */
|
||||||
g_assert (animation_modes[mode].mode == mode);
|
g_assert (animation_modes[mode].mode == mode);
|
||||||
if (G_LIKELY (animation_modes[mode].func != NULL))
|
if (G_LIKELY (animation_modes[mode].func != NULL))
|
||||||
clutter_alpha_set_func (alpha, animation_modes[mode].func, NULL, NULL);
|
clutter_alpha_set_func (alpha, animation_modes[mode].func, NULL, NULL);
|
||||||
|
|
||||||
|
priv->mode = mode;
|
||||||
|
|
||||||
g_object_notify (G_OBJECT (alpha), "mode");
|
g_object_notify (G_OBJECT (alpha), "mode");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user