summaryrefslogtreecommitdiff
path: root/gtk/gtkboxgadget.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-01-22 22:47:47 -0500
committerMatthias Clasen <mclasen@redhat.com>2016-01-22 22:47:47 -0500
commit50e923349ec5690baf957ac614716790df172808 (patch)
tree81bbac264e6f76156161e27314f8bb30689aa94e /gtk/gtkboxgadget.c
parent57baf6804b63a598db49e2ffcc548dc46b145bea (diff)
downloadgtk+-50e923349ec5690baf957ac614716790df172808.tar.gz
box gadget: Fix baseline calculation
Careful comparison with GtkBox revealed that the box gadget code was confusing up and down, and thus shifted baselines vertically.
Diffstat (limited to 'gtk/gtkboxgadget.c')
-rw-r--r--gtk/gtkboxgadget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkboxgadget.c b/gtk/gtkboxgadget.c
index f901d918e7..cf9cb7314a 100644
--- a/gtk/gtkboxgadget.c
+++ b/gtk/gtkboxgadget.c
@@ -223,10 +223,10 @@ gtk_box_gadget_measure_opposite (GtkCssGadget *gadget,
if (child_min_baseline >= 0)
{
- above_min = MAX (above_min, child_min - child_min_baseline);
- below_min = MAX (below_min, child_min_baseline);
- above_nat = MAX (above_nat, child_nat - child_nat_baseline);
- below_nat = MAX (below_nat, child_nat_baseline);
+ below_min = MAX (below_min, child_min - child_min_baseline);
+ above_min = MAX (above_min, child_min_baseline);
+ below_nat = MAX (below_nat, child_nat - child_nat_baseline);
+ above_nat = MAX (above_nat, child_nat_baseline);
}
else
{