From 865b29500c3c4cf3ab2f9bcef7253c182226d95d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 21 Aug 2020 14:29:14 -0400
Subject: [PATCH 1/2] layoutmanager: Fix the child-widget property

We were setting the child-widget property to the parent.
Oops.
---
 gtk/gtklayoutmanager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtklayoutmanager.c b/gtk/gtklayoutmanager.c
index 547c76bbdf..d0e4037b2f 100644
--- a/gtk/gtklayoutmanager.c
+++ b/gtk/gtklayoutmanager.c
@@ -195,7 +195,7 @@ gtk_layout_manager_real_create_layout_child (GtkLayoutManager *manager,
 
   return g_object_new (manager_class->layout_child_type,
                        "layout-manager", manager,
-                       "child-widget", widget,
+                       "child-widget", child,
                        NULL);
 }
 

From 936f3f1ad9ced90199e01ffeb6f812d6d8867063 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 21 Aug 2020 16:22:59 -0400
Subject: [PATCH 2/2] Explicitly set grid positions in the ui file

We were outsmarted by a combination of gtk-builder-tool
removing default values and GtkGrid guessing good values
for omitted properties.

Fixes: #3080
---
 demos/widget-factory/widget-factory.ui | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 8a43c1a11b..0e4b0facdf 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -3140,6 +3140,7 @@ bad things might happen.</property>
             <property name="xalign">1</property>
             <layout>
               <property name="row">1</property>
+              <property name="column">0</property>
             </layout>
           </object>
         </child>
@@ -3166,6 +3167,7 @@ bad things might happen.</property>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
             <layout>
+              <property name="row">0</property>
               <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>