From 6be8979c645387a205f9fbbd91aa669c651ca791 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Tue, 6 Sep 2016 20:23:20 +0900
Subject: [PATCH] Revert "widget factory: Adapt to new scrolled window
 behavior"

This reverts commit 37e913d76bea6b58a38db1b7996958b81984a114.

This is no longer needed since the natural size propagation of
scrolled window children is now an optional behavior. Reverting
this also makes the widget factory scrolled window sizes behave
the same as with the gtk+ 3.20 branch.
---
 demos/widget-factory/widget-factory.ui | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index ee025da19a..58f1e26720 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1389,7 +1389,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="can_focus">1</property>
                             <property name="vscrollbar_policy">always</property>
                             <property name="shadow_type">in</property>
-                            <property name="max_content_width">100</property>
                             <child>
                               <object class="GtkTreeView" id="treeview1">
                                 <property name="visible">1</property>
@@ -1470,8 +1469,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="visible">1</property>
                             <property name="can_focus">1</property>
                             <property name="shadow_type">in</property>
-                            <property name="max_content_width">100</property>
-                            <property name="max_content_height">100</property>
                             <child>
                               <object class="GtkTextView" id="textview1">
                                 <property name="visible">1</property>
@@ -2772,7 +2769,7 @@ microphone-sensitivity-medium-symbolic</property>
                                     <property name="can_focus">1</property>
                                     <property name="shadow_type">in</property>
                                     <property name="margin-top">6</property>
-                                    <property name="max-content-width">100</property>
+                                    <property name="height_request">226</property>
                                     <child>
                                       <object class="GtkIconView" id="iconview1">
                                         <property name="visible">1</property>