diff options
author | Benjamin Otte <otte@redhat.com> | 2017-01-11 02:51:50 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2017-01-11 02:53:12 +0100 |
commit | 4c7ddbf519db17010328b4ffaba994f5b6a9f94c (patch) | |
tree | ce58c0fb9183d4b420440ed0a7fdf4dd92de974a | |
parent | 9133ec5cd49207c36f0a4f3f92776a3d3d81d855 (diff) | |
download | gtk+-4c7ddbf519db17010328b4ffaba994f5b6a9f94c.tar.gz |
cssimage: Fix cross-fade
Simgle image cross-fade opacity was computed the wrong way, which caused
weird fade-in/out animations, for example in flat buttons.
I messed this up when porting cross-fades to snapshot().
-rw-r--r-- | gtk/gtkcssimagecrossfade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkcssimagecrossfade.c b/gtk/gtkcssimagecrossfade.c index 546c2724fe..60e922480e 100644 --- a/gtk/gtkcssimagecrossfade.c +++ b/gtk/gtkcssimagecrossfade.c @@ -150,14 +150,14 @@ gtk_css_image_cross_fade_snapshot (GtkCssImage *image, } else if (start_node) { - gtk_snapshot_push_opacity (snapshot, cross_fade->progress, "CrossFadeStart"); + gtk_snapshot_push_opacity (snapshot, 1.0 - cross_fade->progress, "CrossFadeStart"); gtk_snapshot_append_node (snapshot, start_node); gtk_snapshot_pop_and_append (snapshot); gsk_render_node_unref (start_node); } else if (end_node) { - gtk_snapshot_push_opacity (snapshot, 1.0 - cross_fade->progress, "CrossFadeEnd"); + gtk_snapshot_push_opacity (snapshot, cross_fade->progress, "CrossFadeEnd"); gtk_snapshot_append_node (snapshot, end_node); gtk_snapshot_pop_and_append (snapshot); gsk_render_node_unref (end_node); |