gtkhidingbox: use full variable names

parent 7bd4acde
...@@ -306,19 +306,19 @@ gtk_hiding_box_size_allocate (GtkWidget *widget, ...@@ -306,19 +306,19 @@ gtk_hiding_box_size_allocate (GtkWidget *widget,
static void static void
gtk_hiding_box_get_preferred_width (GtkWidget *widget, gtk_hiding_box_get_preferred_width (GtkWidget *widget,
gint *min, gint *minimum_width,
gint *nat) gint *natural_width)
{ {
GtkHidingBox *box = GTK_HIDING_BOX (widget); GtkHidingBox *box = GTK_HIDING_BOX (widget);
GtkHidingBoxPrivate *priv = gtk_hiding_box_get_instance_private (box); GtkHidingBoxPrivate *priv = gtk_hiding_box_get_instance_private (box);
gint cm; gint child_minimum_width;
gint cn; gint child_natural_width;
GList *child; GList *child;
gint n_visible_children; gint n_visible_children;
gboolean have_min = FALSE; gboolean have_min = FALSE;
*min = 0; *minimum_width = 0;
*nat = 0; *natural_width = 0;
n_visible_children = 0; n_visible_children = 0;
for (child = priv->children; child != NULL; child = child->next) for (child = priv->children; child != NULL; child = child->next)
...@@ -327,20 +327,20 @@ gtk_hiding_box_get_preferred_width (GtkWidget *widget, ...@@ -327,20 +327,20 @@ gtk_hiding_box_get_preferred_width (GtkWidget *widget,
continue; continue;
++n_visible_children; ++n_visible_children;
gtk_widget_get_preferred_width (child->data, &cm, &cn); gtk_widget_get_preferred_width (child->data, &child_minimum_width, &child_natural_width);
/* Minimum is a minimum of the first visible child */ /* Minimum is a minimum of the first visible child */
if (!have_min) if (!have_min)
{ {
*min = cm; *minimum_width = child_minimum_width;
have_min = TRUE; have_min = TRUE;
} }
/* Natural is a sum of all visible children */ /* Natural is a sum of all visible children */
*nat += cn; *natural_width += child_natural_width;
} }
/* Natural must also include the spacing */ /* Natural must also include the spacing */
if (priv->spacing && n_visible_children > 1) if (priv->spacing && n_visible_children > 1)
*nat += priv->spacing * (n_visible_children - 1); *natural_width += priv->spacing * (n_visible_children - 1);
} }
static void static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment