[gtk+/wip/baedert/gtkimageview] box gadget: Fix baseline calculation
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/gtkimageview] box gadget: Fix baseline calculation
- Date: Sun, 24 Jan 2016 20:03:25 +0000 (UTC)
commit 9cc9792351aeb5c2bfe8b4dfe948e50eef2deaee
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jan 22 22:47:47 2016 -0500
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.
gtk/gtkboxgadget.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkboxgadget.c b/gtk/gtkboxgadget.c
index f901d91..cf9cb73 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
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]