[gtk] box: Use widget child list in compute_size_for_orientation
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] box: Use widget child list in compute_size_for_orientation
- Date: Fri, 9 Feb 2018 14:57:16 +0000 (UTC)
commit 5e9f5c17b5e502dd09fcb89672bcc535189c3188
Author: Timm Bäder <mail baedert org>
Date: Tue Feb 6 22:11:01 2018 +0100
box: Use widget child list in compute_size_for_orientation
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().
gtk/gtkbox.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 3567ecbe5f..fac5464e53 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -1231,21 +1231,20 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
gint *natural_size)
{
GtkBoxPrivate *private = gtk_box_get_instance_private (box);
- GList *children;
+ GtkWidget *child;
gint nvis_children = 0;
gint required_size = 0, required_natural = 0, child_size, child_natural;
gint largest_child = 0, largest_natural = 0;
gint spacing = get_spacing (box);
- for (children = private->children; children != NULL;
- children = children->next)
+ for (child = gtk_widget_get_first_child (GTK_WIDGET (box));
+ child != NULL;
+ child = gtk_widget_get_next_sibling (child))
{
- GtkBoxChild *child = children->data;
-
- if (_gtk_widget_get_visible (child->widget))
+ if (_gtk_widget_get_visible (child))
{
- gtk_widget_measure (child->widget,
+ gtk_widget_measure (child,
private->orientation,
avail_size,
&child_size, &child_natural,
@@ -1276,11 +1275,8 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
required_natural += (nvis_children - 1) * spacing;
}
- if (minimum_size)
- *minimum_size = required_size;
-
- if (natural_size)
- *natural_size = required_natural;
+ *minimum_size = required_size;
+ *natural_size = required_natural;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]