[gtk+] box: Remove useless if statement
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] box: Remove useless if statement
- Date: Wed, 17 Jan 2018 20:54:36 +0000 (UTC)
commit 8ab2c79b777a11c8659936d0555d9cf46fe67b26
Author: Timm Bäder <mail baedert org>
Date: Wed Jan 17 12:54:42 2018 +0100
box: Remove useless if statement
We already check right before this one whether child->pack != packing
and if so, we continue to the next iteration. So, no need to check again
whether the inverted condition child->pack == packing is true, because
it is.
gtk/gtkbox.c | 91 ++++++++++++++++++++++++++++------------------------------
1 files changed, 44 insertions(+), 47 deletions(-)
---
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 21f3881..c970c72 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -1142,60 +1142,57 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
continue;
}
- if (child->pack == packing)
- {
- /* Assign the child's size. */
- if (private->homogeneous)
- {
- child_size = size_given_to_child;
+ /* Assign the child's size. */
+ if (private->homogeneous)
+ {
+ child_size = size_given_to_child;
- if (n_extra_widgets > 0)
- {
- child_size++;
- n_extra_widgets--;
- }
- }
- else
- {
- child_size = sizes[i].minimum_size;
+ if (n_extra_widgets > 0)
+ {
+ child_size++;
+ n_extra_widgets--;
+ }
+ }
+ else
+ {
+ child_size = sizes[i].minimum_size;
- if (gtk_widget_compute_expand (child->widget, private->orientation))
- {
- child_size += size_given_to_child;
+ if (gtk_widget_compute_expand (child->widget, private->orientation))
+ {
+ child_size += size_given_to_child;
- if (n_extra_widgets > 0)
- {
- child_size++;
- n_extra_widgets--;
- }
- }
- }
+ if (n_extra_widgets > 0)
+ {
+ child_size++;
+ n_extra_widgets--;
+ }
+ }
+ }
- child_size = child_size;
+ child_size = child_size;
- child_minimum_baseline = child_natural_baseline = -1;
- /* Assign the child's position. */
- gtk_widget_measure (child->widget,
- OPPOSITE_ORIENTATION (private->orientation),
- child_size,
- &child_minimum, &child_natural,
- &child_minimum_baseline, &child_natural_baseline);
+ child_minimum_baseline = child_natural_baseline = -1;
+ /* Assign the child's position. */
+ gtk_widget_measure (child->widget,
+ OPPOSITE_ORIENTATION (private->orientation),
+ child_size,
+ &child_minimum, &child_natural,
+ &child_minimum_baseline, &child_natural_baseline);
- if (child_minimum_baseline >= 0)
- {
- have_baseline = TRUE;
- computed_minimum_below = MAX (computed_minimum_below, child_minimum -
child_minimum_baseline);
- computed_natural_below = MAX (computed_natural_below, child_natural -
child_natural_baseline);
- computed_minimum_above = MAX (computed_minimum_above, child_minimum_baseline);
- computed_natural_above = MAX (computed_natural_above, child_natural_baseline);
- }
- else
- {
- computed_minimum = MAX (computed_minimum, child_minimum);
- computed_natural = MAX (computed_natural, child_natural);
- }
- }
+ if (child_minimum_baseline >= 0)
+ {
+ have_baseline = TRUE;
+ computed_minimum_below = MAX (computed_minimum_below, child_minimum - child_minimum_baseline);
+ computed_natural_below = MAX (computed_natural_below, child_natural - child_natural_baseline);
+ computed_minimum_above = MAX (computed_minimum_above, child_minimum_baseline);
+ computed_natural_above = MAX (computed_natural_above, child_natural_baseline);
+ }
+ else
+ {
+ computed_minimum = MAX (computed_minimum, child_minimum);
+ computed_natural = MAX (computed_natural, child_natural);
+ }
i += 1;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]