AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

buttonbox: Compute clip directly

Browse Source
This commit is contained in:
Timm Bäder 2017-06-25 18:55:42 +02:00 committed by Matthias Clasen
parent 7012950f9f
commit c0f6a97eed
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkbbox.c
View File

@ -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);
}