diff options
| author | Timm Bäder <mail@baedert.org> | 2017-06-25 18:55:42 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-06-28 13:20:59 +0200 |
| commit | c29e03c7b31d7c5cc080c87ee25a3f24509dd24a (patch) | |
| tree | cdfb1596744f85304aa52cd4b505a1c5275c0908 | |
| parent | ca7e9e55b83dcca806fafd04bad3cba8ccb9defd (diff) | |
| download | gtk+-c29e03c7b31d7c5cc080c87ee25a3f24509dd24a.tar.gz | |
buttonbox: Compute clip directly
| -rw-r--r-- | gtk/gtkbbox.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index f78f5b0dc2..549870f1df 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -769,7 +769,8 @@ gtk_button_box_size_allocate (GtkWidget *widget, gint baseline; gint child_baseline; gint i; - GtkAllocation clip; + GtkAllocation clip = *allocation; + GdkRectangle child_clip; if (priv->layout_style == GTK_BUTTONBOX_EXPAND) { @@ -1026,6 +1027,8 @@ gtk_button_box_size_allocate (GtkWidget *widget, } gtk_widget_size_allocate_with_baseline (child, &child_allocation, child_baseline); + gtk_widget_get_clip (child, &child_clip); + gdk_rectangle_union (&clip, &child_clip, &clip); i++; } } @@ -1035,8 +1038,6 @@ gtk_button_box_size_allocate (GtkWidget *widget, g_free (heights); g_free (baselines); - gtk_container_get_children_clip (GTK_CONTAINER (widget), &clip); - gtk_widget_set_clip (widget, &clip); } |