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/gtkviewport.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/gtkviewport.c')
| -rw-r--r-- | gtk/gtkviewport.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index e16a5a48c3..fe34de9841 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -98,8 +98,7 @@ static void gtk_viewport_snapshot (GtkWidget *widget, GtkSnapshot *snapshot); static void gtk_viewport_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, gpointer data); static void viewport_set_adjustment (GtkViewport *viewport, @@ -525,8 +524,7 @@ gtk_viewport_snapshot (GtkWidget *widget, static void gtk_viewport_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = gtk_viewport_get_instance_private (viewport); @@ -543,7 +541,7 @@ gtk_viewport_size_allocate (GtkWidget *widget, child = gtk_bin_get_child (GTK_BIN (widget)); if (child && gtk_widget_get_visible (child)) { - GtkAllocation child_allocation, child_clip; + GtkAllocation child_allocation; child_allocation.x = - gtk_adjustment_get_value (hadjustment); child_allocation.y = - gtk_adjustment_get_value (vadjustment); @@ -551,7 +549,7 @@ gtk_viewport_size_allocate (GtkWidget *widget, child_allocation.height = gtk_adjustment_get_upper (vadjustment); /* Explicitly ignore the child clip here. */ - gtk_widget_size_allocate (child, &child_allocation, -1, &child_clip); + gtk_widget_size_allocate (child, &child_allocation, -1); } g_object_thaw_notify (G_OBJECT (hadjustment)); |