summaryrefslogtreecommitdiff
path: root/gtk/gtkcssimagecrossfadeprivate.h
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2019-03-26 17:39:07 +0100
committerBenjamin Otte <otte@redhat.com>2019-04-12 19:34:28 +0200
commit96f9cbcabf48cd747d588d4732122fdccafe28a0 (patch)
tree1564963b486e3cdbe4a32f9a01df39d5e4cbc2df /gtk/gtkcssimagecrossfadeprivate.h
parent3597f7e8b100d0ed9d131c022b316b5f33165fe5 (diff)
downloadgtk+-96f9cbcabf48cd747d588d4732122fdccafe28a0.tar.gz
cssimage: Make cross-fade() an array
The new spec at https://drafts.csswg.org/css-images-4/#cross-fade-function allows infinite images to cross-fade and we want to, too.
Diffstat (limited to 'gtk/gtkcssimagecrossfadeprivate.h')
-rw-r--r--gtk/gtkcssimagecrossfadeprivate.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk/gtkcssimagecrossfadeprivate.h b/gtk/gtkcssimagecrossfadeprivate.h
index 54929317e4..066508801d 100644
--- a/gtk/gtkcssimagecrossfadeprivate.h
+++ b/gtk/gtkcssimagecrossfadeprivate.h
@@ -24,7 +24,7 @@
G_BEGIN_DECLS
-#define GTK_TYPE_CSS_IMAGE_CROSS_FADE (_gtk_css_image_cross_fade_get_type ())
+#define GTK_TYPE_CSS_IMAGE_CROSS_FADE (gtk_css_image_cross_fade_get_type ())
#define GTK_CSS_IMAGE_CROSS_FADE(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_IMAGE_CROSS_FADE, GtkCssImageCrossFade))
#define GTK_CSS_IMAGE_CROSS_FADE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_IMAGE_CROSS_FADE, GtkCssImageCrossFadeClass))
#define GTK_IS_CSS_IMAGE_CROSS_FADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_CSS_IMAGE_CROSS_FADE))
@@ -38,9 +38,8 @@ struct _GtkCssImageCrossFade
{
GtkCssImage parent;
- GtkCssImage *start;
- GtkCssImage *end;
- double progress;
+ GArray *images;
+ double total_progress;
};
struct _GtkCssImageCrossFadeClass
@@ -48,7 +47,7 @@ struct _GtkCssImageCrossFadeClass
GtkCssImageClass parent_class;
};
-GType _gtk_css_image_cross_fade_get_type (void) G_GNUC_CONST;
+GType gtk_css_image_cross_fade_get_type (void) G_GNUC_CONST;
GtkCssImage * _gtk_css_image_cross_fade_new (GtkCssImage *start,
GtkCssImage *end,