snapshot: Work on pushing and popping again

It is now possible to call push() subfunctions for simple container
nodes with just a single child. So you can for example
gtk_snapshot_push_clip() a clip region that all the nodes that get
appended later will then obey.

gtk_snapshot_pop() will then not return a container node, but a clip
node containing the container node (and similar for the transform
example).

This is implemented internally by providing a "collect function" when
pushing that is called when popping to collects all the accumulated
nodes and combine them into the single node that gets returned.

To simplify things even more, gtk_snapshot_pop_and_append() has been
added, which pops the currently pushed node and appends it to the
parent.

The icon rendering code has been converted to this approach.

1 files changed, 8 insertions, 0 deletions

diff --git a/gtk/gtksnapshotprivate.h b/gtk/gtksnapshotprivate.h
index 9050c4f652..7eba0f48cc 100644
--- a/gtk/gtksnapshotprivate.h
+++ b/gtk/gtksnapshotprivate.h
@@ -24,6 +24,11 @@ G_BEGIN_DECLS
 
 typedef struct _GtkSnapshotState GtkSnapshotState;
 
+typedef GskRenderNode * (* GtkSnapshotCollectFunc) (GskRenderNode **nodes,
+                                                    guint           n_nodes,
+                                                    const char     *name,
+                                                    gpointer        user_data);
+
 struct _GtkSnapshotState {
   GtkSnapshotState      *parent;
 
@@ -33,6 +38,9 @@ struct _GtkSnapshotState {
   cairo_region_t        *clip_region;
   double                 translate_x;
   double                 translate_y;
+
+  GtkSnapshotCollectFunc collect_func;
+  gpointer               collect_data;
 };
 
 struct _GtkSnapshot {