AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

snapshot: Remove new_with_parent

Browse Source 
Unneeded now that we have push_collect()/pop_collect()
This commit is contained in:
Timm Bäder 2020-01-31 17:45:37 +01:00 committed by Matthias Clasen
parent 17ddae5bf9
commit 4cfac3b91c
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtksnapshot.c
View File

@ -162,7 +162,6 @@ gtk_snapshot_new (void)
snapshot = g_object_new (GTK_TYPE_SNAPSHOT, NULL);
snapshot->from_parent = FALSE;
snapshot->state_stack = g_array_new (FALSE, TRUE, sizeof (GtkSnapshotState));
g_array_set_clear_func (snapshot->state_stack, (GDestroyNotify)gtk_snapshot_state_clear);
snapshot->nodes = g_ptr_array_new_with_free_func ((GDestroyNotify)gsk_render_node_unref);
@ -174,24 +173,6 @@ gtk_snapshot_new (void)
return snapshot;
}
/* Private. Does the same as _new but does not allocate a NEW
* state/node stack. */
GtkSnapshot *
gtk_snapshot_new_with_parent (GtkSnapshot *parent_snapshot)
{
GtkSnapshot *snapshot = g_object_new (GTK_TYPE_SNAPSHOT, NULL);
snapshot->state_stack = parent_snapshot->state_stack;
snapshot->nodes = parent_snapshot->nodes;
snapshot->from_parent = TRUE;
gtk_snapshot_push_state (snapshot,
NULL,
gtk_snapshot_collect_default);
return snapshot;
}
/**
* gtk_snapshot_free_to_node: (skip)
* @snapshot: (transfer full): a #GtkSnapshot
@ -1048,8 +1029,7 @@ gtk_snapshot_pop_one (GtkSnapshot *snapshot)
guint state_index;
GskRenderNode *node;
if (snapshot->state_stack->len == 0 &&
!snapshot->from_parent)
if (snapshot->state_stack->len == 0)
{
g_warning ("Too many gtk_snapshot_pop() calls.");
return NULL;
@ -1182,17 +1162,13 @@ gtk_snapshot_to_node (GtkSnapshot *snapshot)
result = gtk_snapshot_pop_internal (snapshot);
/* We should have exactly our initial state */
if (snapshot->state_stack->len > 0 &&
!snapshot->from_parent)
if (snapshot->state_stack->len > 0)
{
g_warning ("Too many gtk_snapshot_push() calls. %u states remaining.", snapshot->state_stack->len);
}
if (!snapshot->from_parent)
{
g_array_free (snapshot->state_stack, TRUE);
g_ptr_array_free (snapshot->nodes, TRUE);
}
g_array_free (snapshot->state_stack, TRUE);
g_ptr_array_free (snapshot->nodes, TRUE);
snapshot->state_stack = NULL;
snapshot->nodes = NULL;

4
gtk/gtksnapshotprivate.h
View File

@ -88,16 +88,12 @@ struct _GdkSnapshot {
GArray *state_stack;
GPtrArray *nodes;
guint from_parent : 1;
};
struct _GtkSnapshotClass {
GObjectClass parent_class; /* it's really GdkSnapshotClass, but don't tell anyone! */
};
GtkSnapshot * gtk_snapshot_new_with_parent (GtkSnapshot *parent_snapshot);
void gtk_snapshot_append_text (GtkSnapshot *snapshot,
PangoFont *font,
PangoGlyphString *glyphs,