diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-31 21:02:28 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2018-04-05 14:56:38 +0200 |
| commit | 169203951b1a338e0a7ef737238731619e5b8c4a (patch) | |
| tree | 61eebf0a1f0a4b777e3ce58e779b2aa5fda31f63 /gtk/gtkbox.c | |
| parent | fc6de135fe30ad285c50267bc9d24e10135bcc2c (diff) | |
| download | gtk+-169203951b1a338e0a7ef737238731619e5b8c4a.tar.gz | |
widget: Remove clip from size-allocate vfunc
As the clip is no longer needed, get rid of it.
Diffstat (limited to 'gtk/gtkbox.c')
| -rw-r--r-- | gtk/gtkbox.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index bfe4b2bf11..f89c3fd3bc 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -143,8 +143,7 @@ struct _GtkBoxChild static void gtk_box_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_box_direction_changed (GtkWidget *widget, GtkTextDirection previous_direction); @@ -371,8 +370,7 @@ get_spacing (GtkBox *box) static void gtk_box_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GdkRectangle *out_clip) + int baseline) { GtkBox *box = GTK_BOX (widget); GtkBoxPrivate *priv = gtk_box_get_instance_private (box); @@ -398,7 +396,6 @@ gtk_box_size_allocate (GtkWidget *widget, gint x = 0, y = 0, i; gint child_size; gint spacing; - GdkRectangle clip; count_expand_children (box, &nvis_children, &nexpand_children); @@ -660,8 +657,7 @@ gtk_box_size_allocate (GtkWidget *widget, child_allocation.y -= child_size; } } - gtk_widget_size_allocate (child->widget, &child_allocation, baseline, &clip); - gdk_rectangle_union (&clip, out_clip, out_clip); + gtk_widget_size_allocate (child->widget, &child_allocation, baseline); i++; } |