diff --git a/ChangeLog b/ChangeLog index 654e84d6f..9d6080484 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-16 Emmanuele bassi + + * clutter/clutter-color.c: Copy the alpha when shading. + 2007-10-16 Tomas Frydrych * clutter.symbols: @@ -5,7 +9,8 @@ * clutter/clutter-script.c: * json/json-node.c: - Use g_slice_new0 instead of g_slice_new to avoid passing garbage to functions. + Use g_slice_new0 instead of g_slice_new to avoid passing + garbage to functions. * tests/test-threads.c: Replaced non-portable sleep() with g_usleep(). diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c index 17219a9f0..d567f1368 100644 --- a/clutter/clutter-color.c +++ b/clutter/clutter-color.c @@ -372,7 +372,7 @@ clutter_color_shade (const ClutterColor *src, ClutterColor *dest, gdouble shade) { - clutter_color_shadex (src, dest, CLUTTER_FLOAT_TO_FIXED (shade)); + clutter_color_shadex (src, dest, CLUTTER_FLOAT_TO_FIXED (shade)); } /** @@ -413,6 +413,7 @@ clutter_color_shadex (const ClutterColor *src, s = 0; clutter_color_from_hlsx (dest, h, l, s); + dest->alpha = src->alpha; } /**