AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

box: Use widget child list in compute_size_for_orientation

Browse Source 
And remove the non-NULL checks for minimum_size and natural_size since
these are non-NULL by definition since this function is only called from
measure().
This commit is contained in:
Timm Bäder 2018-02-06 22:11:01 +01:00
parent ff5928754f
commit 5e9f5c17b5
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkbox.c
View File

@ -1231,21 +1231,20 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
gint *natural_size) gint *natural_size)
{ {
GtkBoxPrivate *private = gtk_box_get_instance_private (box); GtkBoxPrivate *private = gtk_box_get_instance_private (box);
GList *children; GtkWidget *child;
gint nvis_children = 0; gint nvis_children = 0;
gint required_size = 0, required_natural = 0, child_size, child_natural; gint required_size = 0, required_natural = 0, child_size, child_natural;
gint largest_child = 0, largest_natural = 0; gint largest_child = 0, largest_natural = 0;
gint spacing = get_spacing (box); gint spacing = get_spacing (box);
for (children = private->children; children != NULL; for (child = gtk_widget_get_first_child (GTK_WIDGET (box));
children = children->next) child != NULL;
child = gtk_widget_get_next_sibling (child))
{ {
GtkBoxChild *child = children->data; if (_gtk_widget_get_visible (child))
if (_gtk_widget_get_visible (child->widget))
{ {
gtk_widget_measure (child->widget, gtk_widget_measure (child,
private->orientation, private->orientation,
avail_size, avail_size,
&child_size, &child_natural, &child_size, &child_natural,
@ -1276,11 +1275,8 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
required_natural += (nvis_children - 1) * spacing; required_natural += (nvis_children - 1) * spacing;
} }
if (minimum_size) *minimum_size = required_size;
*minimum_size = required_size; *natural_size = required_natural;
if (natural_size)
*natural_size = required_natural;
} }