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/gtkstack.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/gtkstack.c')
| -rw-r--r-- | gtk/gtkstack.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index a774abddf4..b508aee659 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -170,8 +170,7 @@ static void gtk_stack_compute_expand (GtkWidget *widget, gboolean *vexpand); static void gtk_stack_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_stack_snapshot (GtkWidget *widget, GtkSnapshot *snapshot); static void gtk_stack_measure (GtkWidget *widget, @@ -2003,12 +2002,10 @@ gtk_stack_snapshot (GtkWidget *widget, static void gtk_stack_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkStack *stack = GTK_STACK (widget); GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); - GdkRectangle child_clip; GtkAllocation child_allocation; child_allocation.x = get_bin_window_x (stack); @@ -2027,8 +2024,7 @@ gtk_stack_size_allocate (GtkWidget *widget, &min, &nat, NULL, NULL); child_allocation.height = MAX (min, allocation->height); - gtk_widget_size_allocate (priv->last_visible_child->widget, &child_allocation, -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (priv->last_visible_child->widget, &child_allocation, -1); if (!gdk_rectangle_equal (&priv->last_visible_surface_allocation, &child_allocation)) @@ -2073,8 +2069,7 @@ gtk_stack_size_allocate (GtkWidget *widget, child_allocation.y = (allocation->height - child_allocation.height); } - gtk_widget_size_allocate (priv->visible_child->widget, &child_allocation, -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (priv->visible_child->widget, &child_allocation, -1); } } |