summaryrefslogtreecommitdiff
path: root/gtk/gtkcssimagevalue.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2012-04-02 03:37:25 +0200
committerBenjamin Otte <otte@redhat.com>2012-04-17 08:59:16 +0200
commite597f4d6a997d0f8f4f27f50ed35a8472b406be7 (patch)
tree66310174ad691d88f7d8f4724c7b1b3515193ae5 /gtk/gtkcssimagevalue.c
parentd853a8f2f72e1261b0d301be6ba8a480a37a3e45 (diff)
downloadgtk+-e597f4d6a997d0f8f4f27f50ed35a8472b406be7.tar.gz
cssvalue: Add transition support for images
Diffstat (limited to 'gtk/gtkcssimagevalue.c')
-rw-r--r--gtk/gtkcssimagevalue.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/gtk/gtkcssimagevalue.c b/gtk/gtkcssimagevalue.c
index 0beb3fe9c7..e67e9ea51a 100644
--- a/gtk/gtkcssimagevalue.c
+++ b/gtk/gtkcssimagevalue.c
@@ -19,7 +19,7 @@
#include "gtkcssimagevalueprivate.h"
-#include "gtkstylepropertyprivate.h"
+#include "gtkcssimagecrossfadeprivate.h"
struct _GtkCssValue {
GTK_CSS_VALUE_BASE
@@ -45,7 +45,13 @@ gtk_css_value_image_transition (GtkCssValue *start,
GtkCssValue *end,
double progress)
{
- return NULL;
+ GtkCssImage *fade;
+
+ fade = _gtk_css_image_cross_fade_new (_gtk_css_image_value_get_image (start),
+ _gtk_css_image_value_get_image (end),
+ progress);
+
+ return _gtk_css_image_value_new (fade);
}
static void