]> Pileus Git - ~andy/gtk/commitdiff
cssvalue: Add transition support for images
authorBenjamin Otte <otte@redhat.com>
Mon, 2 Apr 2012 01:37:25 +0000 (03:37 +0200)
committerBenjamin Otte <otte@redhat.com>
Tue, 17 Apr 2012 06:59:16 +0000 (08:59 +0200)
gtk/gtkcssimagevalue.c

index 0beb3fe9c7cf63b8cafd5969e01095e7a309af7b..e67e9ea51a02870bcc4739c4439695de875140dc 100644 (file)
@@ -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