[gnome-builder] preferences: scroll page and subpage together

[Christian Hergert <chergert src gnome org>]

commit 0283ae7a18e7948fa04c55c1fb3054ec48ea4ad7
Author: Christian Hergert <chergert redhat com>
Date:   Sat Sep 17 17:04:55 2016 -0700

    preferences: scroll page and subpage together
    
    Ideally we wont get to it, but if we do, they should scroll together.
    We still need more work around avoiding the extra scrolling when we have
    a single column of a long list.

 libide/preferences/ide-preferences-page.ui        |   12 +-----
 libide/preferences/ide-preferences-perspective.ui |   38 +++++++++++++++------
 2 files changed, 29 insertions(+), 21 deletions(-)
---
diff --git a/libide/preferences/ide-preferences-page.ui b/libide/preferences/ide-preferences-page.ui
index a01fbb0..a9b6bd6 100644
--- a/libide/preferences/ide-preferences-page.ui
+++ b/libide/preferences/ide-preferences-page.ui
@@ -3,17 +3,9 @@
   <!-- interface-requires gtk+ 3.18 -->
   <template class="IdePreferencesPage" parent="GtkBin">
     <child>
-      <object class="GtkScrolledWindow">
-        <property name="hscrollbar-policy">never</property>
+      <object class="IdePreferencesFlowBox" id="box">
+        <property name="border-width">24</property>
         <property name="visible">true</property>
-        <property name="propagate-natural-height">true</property>
-        <property name="propagate-natural-width">true</property>
-        <child>
-          <object class="IdePreferencesFlowBox" id="box">
-            <property name="border-width">24</property>
-            <property name="visible">true</property>
-          </object>
-        </child>
       </object>
     </child>
   </template>
diff --git a/libide/preferences/ide-preferences-perspective.ui 
b/libide/preferences/ide-preferences-perspective.ui
index 07fe6f3..7af0449 100644
--- a/libide/preferences/ide-preferences-perspective.ui
+++ b/libide/preferences/ide-preferences-perspective.ui
@@ -30,20 +30,36 @@
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="orientation">horizontal</property>
+          <object class="GtkScrolledWindow">
+            <property name="hscrollbar-policy">never</property>
             <property name="visible">true</property>
             <child>
-              <object class="GtkStack" id="page_stack">
-                <property name="transition-duration">333</property>
-                <property name="transition-type">crossfade</property>
+              <object class="GtkBox">
+                <property name="orientation">horizontal</property>
                 <property name="visible">true</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="subpage_stack">
-                <property name="transition-duration">333</property>
-                <property name="transition-type">crossfade</property>
+                <child>
+                  <object class="GtkStack" id="page_stack">
+                    <property name="homogeneous">false</property>
+                    <property name="transition-duration">333</property>
+                    <property name="transition-type">crossfade</property>
+                    <property name="visible">true</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="hexpand">true</property>
+                    <property name="visible">true</property>
+                    <child>
+                      <object class="GtkStack" id="subpage_stack">
+                        <property name="halign">start</property>
+                        <property name="hexpand">false</property>
+                        <property name="homogeneous">false</property>
+                        <property name="transition-duration">333</property>
+                        <property name="transition-type">crossfade</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>