From b3fedda29ee4896d4a86c917ca4db5b664d57d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Wed, 11 Oct 2017 08:49:44 +0200
Subject: [PATCH] grid: Only pass baselines to children that request it

---
 gtk/gtkgrid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 50d2865f62..6a98bd6a3f 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1538,7 +1538,7 @@ allocate_child (GtkGridRequest *request,
   attach = &child->attach[orientation];
 
   *position = lines->lines[attach->pos - lines->min].position;
-  if (attach->span == 1)
+  if (attach->span == 1 && gtk_widget_get_valign (child->widget) == GTK_ALIGN_BASELINE)
     *baseline = lines->lines[attach->pos - lines->min].allocated_baseline;
   else
     *baseline = -1;