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/gtkframe.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/gtkframe.c')
| -rw-r--r-- | gtk/gtkframe.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 2bc083b83e..3afb54ecb6 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -120,8 +120,7 @@ static void gtk_frame_get_property (GObject *object, GParamSpec *pspec); static void gtk_frame_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_frame_remove (GtkContainer *container, GtkWidget *child); static void gtk_frame_forall (GtkContainer *container, @@ -573,14 +572,12 @@ gtk_frame_get_shadow_type (GtkFrame *frame) static void gtk_frame_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkFrame *frame = GTK_FRAME (widget); GtkFramePrivate *priv = frame->priv; GtkWidget *child; GtkAllocation new_allocation; - GtkAllocation child_clip; gtk_frame_compute_child_allocation (frame, &new_allocation); priv->child_allocation = new_allocation; @@ -607,15 +604,13 @@ gtk_frame_size_allocate (GtkWidget *widget, priv->label_allocation.height = height; priv->label_allocation.width = width; - gtk_widget_size_allocate (priv->label_widget, &priv->label_allocation, -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (priv->label_widget, &priv->label_allocation, -1); } child = gtk_bin_get_child (GTK_BIN (widget)); if (child && gtk_widget_get_visible (child)) { - gtk_widget_size_allocate (child, &priv->child_allocation, -1, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (child, &priv->child_allocation, -1); } } |