summaryrefslogtreecommitdiff
path: root/gtk/gtkcssrgbavalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-06-26 21:08:04 +0200
committerBenjamin Otte <otte@redhat.com>2015-06-26 21:12:50 +0200
commitcd3f24d5793e038ee29d780b24747707c73ad00c (patch)
tree4e06de6da08db1f87e31219dcb4ea4e547cb1f35 /gtk/gtkcssrgbavalue.c
parent142abce46a18ef09ca77ed581cf3b385671c9515 (diff)
downloadgtk+-cd3f24d5793e038ee29d780b24747707c73ad00c.tar.gz
cssvalue: Change color transitions to run premultiplied
Previously, the unpremultiplied values from the GdkRGBA were taken. Now we premultiply the color values as specified by the CSS specs. This is only relevant when transitioning with translucent colors. An example is the halfway transition between transparent (0, 0, 0, 0) and white (1, 1, 1, 1). Previously, all 4 values where transitioned separately and the result was semi-transparent gray (0.5, 0.5, 0.5, 0.5). By depending on the alpha value, the result is now semi-transparent white (1, 1, 1, 0.5) which is what one would naively expect. New reftest: color-transition
Diffstat (limited to 'gtk/gtkcssrgbavalue.c')
-rw-r--r--gtk/gtkcssrgbavalue.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/gtk/gtkcssrgbavalue.c b/gtk/gtkcssrgbavalue.c
index 0b66f8a113..7005347e0e 100644
--- a/gtk/gtkcssrgbavalue.c
+++ b/gtk/gtkcssrgbavalue.c
@@ -74,9 +74,15 @@ gtk_css_value_rgba_transition (GtkCssValue *start,
}
else
{
- result.red = transition (start->rgba.red, end->rgba.red, progress);
- result.green = transition (start->rgba.green, end->rgba.green, progress);
- result.blue = transition (start->rgba.blue, end->rgba.blue, progress);
+ result.red = transition (start->rgba.red * start->rgba.alpha,
+ end->rgba.red * end->rgba.alpha,
+ progress) / result.alpha;
+ result.green = transition (start->rgba.green * start->rgba.alpha,
+ end->rgba.green * end->rgba.alpha,
+ progress) / result.alpha;
+ result.blue = transition (start->rgba.blue * start->rgba.alpha,
+ end->rgba.blue * end->rgba.alpha,
+ progress) / result.alpha;
}
return _gtk_css_rgba_value_new_from_rgba (&result);