Fix for some gtk3 widget layout issues.

diff --git a/data/ui/object-editor.ui b/data/ui/object-editor.ui
index 9fde5f1f5ff29656dfd162a1260b80c223aaa0b0..82136326208c0361810a258233b4f36fbe84e022 100644 (file)
--- a/data/ui/object-editor.ui
+++ b/data/ui/object-editor.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkSizeGroup" id="width_sizegroup">
     <widgets>
@@ -2314,27 +2314,6 @@
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkVBox" id="dummy_vbox">
-                    <property name="visible">True</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">11</property>
-                  </packing>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="dummy_page">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">label48</property>
-                  </object>
-                  <packing>
-                    <property name="position">11</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="expand">True</property>

diff --git a/src/ui-sidebar.c b/src/ui-sidebar.c
index 68952315ec50ba427f9677f9ded8b701e2258830..ad0cba5c1591ca54d06830ff1b9714e94f587b12 100644 (file)
--- a/src/ui-sidebar.c
+++ b/src/ui-sidebar.c
@@ -143,6 +143,7 @@ gl_ui_sidebar_construct (glUISidebar       *sidebar)
 
         gtk_box_pack_start (GTK_BOX (sidebar), sidebar->priv->editor, FALSE, FALSE, 0);
         gtk_widget_set_vexpand (GTK_WIDGET (sidebar->priv->editor), FALSE);
+        gtk_widget_set_hexpand (GTK_WIDGET (sidebar->priv->editor), FALSE);
 
        gl_debug (DEBUG_UI, "END");
 }