From: Jim Evins <evins@snaught.com>
Date: Mon, 20 Dec 2010 04:40:22 +0000 (-0500)
Subject: Fix vertical expansion of various widgets
X-Git-Tag: glabels-2_3_1~25
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=554266756a638ad0ee161decfe07bb86b8bc4b3f;p=glabels

Fix vertical expansion of various widgets

Gtk3 has new behavior for expansion of widgets. This commit turns off vertical
expansion for various widgets created with builder UI files.  These properties
have been added manually to these files, so they could be easily wiped out
by editing them with glade.
---

diff --git a/data/ui/object-editor.ui b/data/ui/object-editor.ui
index ae36eec3..582a19e0 100644
--- a/data/ui/object-editor.ui
+++ b/data/ui/object-editor.ui
@@ -754,6 +754,7 @@
                           <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
+			    <property name="vexpand">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox38">
                                 <property name="visible">True</property>
@@ -874,6 +875,7 @@
                       <object class="GtkHBox" id="hbox73">
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
+			<property name="vexpand">False</property>
                         <child>
                           <object class="GtkLabel" id="fill_color_label">
                             <property name="visible">True</property>
@@ -1313,6 +1315,7 @@
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
                         <property name="row_spacing">6</property>
+			<property name="vexpand">False</property>
                         <child>
                           <object class="GtkLabel" id="bc_be_label">
                             <property name="visible">True</property>
@@ -1404,6 +1407,7 @@
                       <object class="GtkHBox" id="hbox80">
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
+			<property name="vexpand">False</property>
                         <child>
                           <object class="GtkLabel" id="bc_color_label">
                             <property name="visible">True</property>
@@ -2001,6 +2005,7 @@
                       <object class="GtkVBox" id="shadow_controls_table">
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
+			<property name="vexpand">False</property>
                         <child>
                           <object class="GtkHBox" id="hbox63">
                             <property name="visible">True</property>
diff --git a/data/ui/print-op-dialog-custom-widget.ui b/data/ui/print-op-dialog-custom-widget.ui
index e32a149b..f6662b5f 100644
--- a/data/ui/print-op-dialog-custom-widget.ui
+++ b/data/ui/print-op-dialog-custom-widget.ui
@@ -52,10 +52,12 @@
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="spacing">12</property>
+            <property name="vexpand">False</property>
             <child>
               <object class="GtkVBox" id="vbox3">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
+		<property name="vexpand">False</property>
                 <child>
                   <object class="GtkFrame" id="simple_frame">
                     <property name="visible">True</property>