Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix g_object_new(GTK_TYPE_SNAPSHOT)

Browse Source 
GJS apparent likes g_object_new() over actual constructors, so make that work.
This commit is contained in:
Benjamin Otte
2022-08-01 20:08:58 +00:00
parent 9bce70ed8d
commit 09f0c96b9b
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtksnapshot.c
View File

@@ -179,11 +179,6 @@ gtk_snapshot_class_init (GtkSnapshotClass *klass)
gobject_class->dispose = gtk_snapshot_dispose; gobject_class->dispose = gtk_snapshot_dispose;
} }
static void
gtk_snapshot_init (GtkSnapshot *self)
{
}
static GskRenderNode * static GskRenderNode *
gtk_snapshot_collect_default (GtkSnapshot *snapshot, gtk_snapshot_collect_default (GtkSnapshot *snapshot,
GtkSnapshotState *state, GtkSnapshotState *state,
@@ -270,6 +265,18 @@ gtk_snapshot_state_clear (GtkSnapshotState *state)
gsk_transform_unref (state->transform); gsk_transform_unref (state->transform);
} }
static void
gtk_snapshot_init (GtkSnapshot *self)
{
gtk_snapshot_states_init (&self->state_stack);
gtk_snapshot_nodes_init (&self->nodes);
gtk_snapshot_push_state (self,
NULL,
gtk_snapshot_collect_default,
NULL);
}
/** /**
* gtk_snapshot_new: * gtk_snapshot_new:
* *
@@ -280,19 +287,7 @@ gtk_snapshot_state_clear (GtkSnapshotState *state)
GtkSnapshot * GtkSnapshot *
gtk_snapshot_new (void) gtk_snapshot_new (void)
{ {
GtkSnapshot *snapshot; return g_object_new (GTK_TYPE_SNAPSHOT, NULL);
snapshot = g_object_new (GTK_TYPE_SNAPSHOT, NULL);
gtk_snapshot_states_init (&snapshot->state_stack);
gtk_snapshot_nodes_init (&snapshot->nodes);
gtk_snapshot_push_state (snapshot,
NULL,
gtk_snapshot_collect_default,
NULL);
return snapshot;
} }
/** /**
@@ -761,7 +756,7 @@ gtk_snapshot_ensure_translate (GtkSnapshot *snapshot,
gtk_snapshot_autopush_transform (snapshot); gtk_snapshot_autopush_transform (snapshot);
state = gtk_snapshot_get_current_state (snapshot); state = gtk_snapshot_get_current_state (snapshot);
} }
gsk_transform_to_translate (state->transform, dx, dy); gsk_transform_to_translate (state->transform, dx, dy);
} }
@@ -850,7 +845,7 @@ gtk_snapshot_push_clip (GtkSnapshot *snapshot,
{ {
GtkSnapshotState *state; GtkSnapshotState *state;
float scale_x, scale_y, dx, dy; float scale_x, scale_y, dx, dy;
gtk_snapshot_ensure_affine (snapshot, &scale_x, &scale_y, &dx, &dy); gtk_snapshot_ensure_affine (snapshot, &scale_x, &scale_y, &dx, &dy);
state = gtk_snapshot_push_state (snapshot, state = gtk_snapshot_push_state (snapshot,
@@ -2517,7 +2512,7 @@ gtk_snapshot_append_border (GtkSnapshot *snapshot,
gsk_rounded_rect_scale_affine (&real_outline, outline, scale_x, scale_y, dx, dy); gsk_rounded_rect_scale_affine (&real_outline, outline, scale_x, scale_y, dx, dy);
node = gsk_border_node_new (&real_outline, node = gsk_border_node_new (&real_outline,
(float[4]) { (float[4]) {
border_width[0] * scale_y, border_width[0] * scale_y,
border_width[1] * scale_x, border_width[1] * scale_x,
border_width[2] * scale_y, border_width[2] * scale_y,