diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index a0ccb783d9..d6ef6f9886 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -319,6 +319,7 @@
paintable_svg.c
panes.c
password_entry.c
+ path_fill.c
peg_solitaire.c
pickers.c
printing.c
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 9076c05383..20c65d2e97 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -68,6 +68,7 @@ demos = files([
'paintable_mediastream.c',
'panes.c',
'password_entry.c',
+ 'path_fill.c',
'peg_solitaire.c',
'pickers.c',
'printing.c',
diff --git a/demos/gtk-demo/path_fill.c b/demos/gtk-demo/path_fill.c
new file mode 100644
index 0000000000..ed2a63d669
--- /dev/null
+++ b/demos/gtk-demo/path_fill.c
@@ -0,0 +1,231 @@
+/* Path/Fill
+ *
+ * This demo shows how to use PangoCairo to draw text with more than
+ * just a single color.
+ */
+
+#include
+#include
+
+#include "paintable.h"
+
+#define GTK_TYPE_PATH_PAINTABLE (gtk_path_paintable_get_type ())
+G_DECLARE_FINAL_TYPE (GtkPathPaintable, gtk_path_paintable, GTK, PATH_PAINTABLE, GObject)
+
+struct _GtkPathPaintable
+{
+ GObject parent_instance;
+
+ int width;
+ int height;
+ GskPath *path;
+ GdkPaintable *background;
+};
+
+struct _GtkPathPaintableClass
+{
+ GObjectClass parent_class;
+};
+
+static int
+gtk_path_paintable_get_intrinsic_width (GdkPaintable *paintable)
+{
+ GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+ if (self->background)
+ return MAX (gdk_paintable_get_intrinsic_width (self->background), self->width);
+ else
+ return self->width;
+}
+
+static int
+gtk_path_paintable_get_intrinsic_height (GdkPaintable *paintable)
+{
+ GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+ if (self->background)
+ return MAX (gdk_paintable_get_intrinsic_height (self->background), self->height);
+ else
+ return self->height;
+}
+
+static void
+gtk_path_paintable_snapshot (GdkPaintable *paintable,
+ GdkSnapshot *snapshot,
+ double width,
+ double height)
+{
+ GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+ gtk_snapshot_push_fill (snapshot, self->path, GSK_FILL_RULE_WINDING);
+
+ if (self->background)
+ {
+ gdk_paintable_snapshot (self->background, snapshot, width, height);
+ }
+ else
+ {
+ gtk_snapshot_append_linear_gradient (snapshot,
+ &GRAPHENE_RECT_INIT (0, 0, width, height),
+ &GRAPHENE_POINT_INIT (0, 0),
+ &GRAPHENE_POINT_INIT (width, height),
+ (GskColorStop[8]) {
+ { 0.0, { 1.0, 0.0, 0.0, 1.0 } },
+ { 0.2, { 1.0, 0.0, 0.0, 1.0 } },
+ { 0.3, { 1.0, 1.0, 0.0, 1.0 } },
+ { 0.4, { 0.0, 1.0, 0.0, 1.0 } },
+ { 0.6, { 0.0, 1.0, 1.0, 1.0 } },
+ { 0.7, { 0.0, 0.0, 1.0, 1.0 } },
+ { 0.8, { 1.0, 0.0, 1.0, 1.0 } },
+ { 1.0, { 1.0, 0.0, 1.0, 1.0 } }
+ },
+ 8);
+ }
+
+ gtk_snapshot_pop (snapshot);
+
+}
+
+static GdkPaintableFlags
+gtk_path_paintable_get_flags (GdkPaintable *paintable)
+{
+ GtkPathPaintable *self = GTK_PATH_PAINTABLE (paintable);
+
+ if (self->background)
+ return gdk_paintable_get_flags (self->background);
+ else
+ return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
+}
+
+static void
+gtk_path_paintable_paintable_init (GdkPaintableInterface *iface)
+{
+ iface->get_intrinsic_width = gtk_path_paintable_get_intrinsic_width;
+ iface->get_intrinsic_height = gtk_path_paintable_get_intrinsic_height;
+ iface->snapshot = gtk_path_paintable_snapshot;
+ iface->get_flags = gtk_path_paintable_get_flags;
+}
+
+/* When defining the GType, we need to implement the GdkPaintable interface */
+G_DEFINE_TYPE_WITH_CODE (GtkPathPaintable, gtk_path_paintable, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+ gtk_path_paintable_paintable_init))
+
+/* Here's the boilerplate for the GObject declaration.
+ * We don't need to do anything special here, because we keep no
+ * data of our own.
+ */
+static void
+gtk_path_paintable_class_init (GtkPathPaintableClass *klass)
+{
+}
+
+static void
+gtk_path_paintable_init (GtkPathPaintable *self)
+{
+}
+
+/* And finally, we add a simple constructor.
+ * It is declared in the header so that the other examples
+ * can use it.
+ */
+GdkPaintable *
+gtk_path_paintable_new (GskPath *path,
+ GdkPaintable *background,
+ int width,
+ int height)
+{
+ GtkPathPaintable *self;
+
+ self = g_object_new (GTK_TYPE_PATH_PAINTABLE, NULL);
+ self->path = path;
+ self->background = background;
+ if (self->background)
+ {
+ g_signal_connect_swapped (self->background, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
+ g_signal_connect_swapped (self->background, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
+ }
+ self->width = width;
+ self->height = height;
+
+ return GDK_PAINTABLE (self);
+}
+
+static GskPath *
+create_path_from_text (GtkWidget *widget)
+{
+ cairo_surface_t *surface;
+ cairo_t *cr;
+ cairo_path_t *path;
+ PangoLayout *layout;
+ PangoFontDescription *desc;
+ GskPath *result;
+
+ surface = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, NULL);
+ cr = cairo_create (surface);
+
+ layout = gtk_widget_create_pango_layout (widget, "Pango power!\nPango power!\nPango power!");
+ desc = pango_font_description_from_string ("sans bold 36");
+ pango_layout_set_font_description (layout, desc);
+ pango_font_description_free (desc);
+
+ pango_cairo_layout_path (cr, layout);
+ path = cairo_copy_path (cr);
+ result = gsk_path_new_from_cairo (path);
+
+ cairo_path_destroy (path);
+ g_object_unref (layout);
+ cairo_destroy (cr);
+ cairo_surface_destroy (surface);
+
+ return result;
+}
+
+GtkWidget *
+do_path_fill (GtkWidget *do_widget)
+{
+ static GtkWidget *window = NULL;
+
+ if (!window)
+ {
+ GtkWidget *picture;
+ GdkPaintable *paintable;
+ GtkMediaStream *stream;
+ GskPath *path;
+ graphene_rect_t bounds;
+
+ window = gtk_window_new ();
+ gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+ gtk_window_set_title (GTK_WINDOW (window), "Path Fill");
+ g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+#if 0
+ stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+#else
+ stream = gtk_nuclear_media_stream_new ();
+#endif
+ gtk_media_stream_play (stream);
+ gtk_media_stream_set_loop (stream, TRUE);
+
+ path = create_path_from_text (window);
+ gsk_path_get_bounds (path, &bounds);
+
+ paintable = gtk_path_paintable_new (create_path_from_text (window),
+ GDK_PAINTABLE (stream),
+ bounds.origin.x + bounds.size.width,
+ bounds.origin.y + bounds.size.height);
+ picture = gtk_picture_new_for_paintable (paintable);
+ gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
+ gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
+ g_object_unref (paintable);
+
+ gtk_window_set_child (GTK_WINDOW (window), picture);
+ }
+
+ if (!gtk_widget_get_visible (window))
+ gtk_widget_show (window);
+ else
+ gtk_window_destroy (GTK_WINDOW (window));
+
+ return window;
+}