[ease] [editor] Fixed background widgets not filling horizontally.

[Nate Stedman <natesm src gnome org>]

commit bdec79aba2eb32f06d104ca5f601bbb5d62daaa4
Author: Nate Stedman <natesm gmail com>
Date:   Fri Oct 15 12:08:00 2010 -0400

    [editor] Fixed background widgets not filling horizontally.

 data/ui/background.ui                 |  405 ++++++++++++++++-----------------
 ease-core/ease-background-widget.vala |    2 +-
 2 files changed, 201 insertions(+), 206 deletions(-)
---
diff --git a/data/ui/background.ui b/data/ui/background.ui
index 5b1e2ca..913def2 100644
--- a/data/ui/background.ui
+++ b/data/ui/background.ui
@@ -1,33 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkAlignment" id="root">
+  <object class="GtkAdjustment" id="adjustment-angle">
+    <property name="upper">6.2800000000000002</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkVBox" id="root">
     <property name="visible">True</property>
+    <property name="spacing">10</property>
     <child>
-      <object class="GtkVBox" id="vbox-root">
+      <object class="GtkVBox" id="vbox-style">
         <property name="visible">True</property>
-        <property name="spacing">10</property>
         <child>
-          <object class="GtkVBox" id="vbox-style">
+          <object class="GtkHBox" id="hbox-style">
             <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox-style">
+              <object class="GtkLabel" id="style-label">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="style-label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Background Style</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">Background Style</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -36,40 +28,40 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="combobox-style">
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <signal name="changed" handler="ease_background_widget_on_background_changed"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox-color">
+          <object class="GtkComboBox" id="combobox-style">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <signal name="changed" handler="ease_background_widget_on_background_changed"/>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox-color">
+        <child>
+          <object class="GtkHBox" id="hbox2">
+            <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkLabel" id="color-label">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="color-label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Background Color</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">Background Color</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -78,45 +70,45 @@
               </packing>
             </child>
             <child>
-              <object class="GtkColorButton" id="color-color">
-                <property name="height_request">30</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="color">#000000000000</property>
-                <signal name="color_set" handler="ease_background_widget_on_color_set"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkColorButton" id="color-color">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="color">#000000000000</property>
+            <signal name="color_set" handler="ease_background_widget_on_color_set"/>
+          </object>
+          <packing>
             <property name="position">1</property>
           </packing>
         </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox-gradient">
+        <property name="spacing">4</property>
         <child>
-          <object class="GtkVBox" id="vbox-gradient">
-            <property name="spacing">4</property>
+          <object class="GtkHBox" id="hbox3">
+            <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox3">
+              <object class="GtkLabel" id="gradient-label">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="gradient-label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Background Gradient</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">Background Gradient</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -125,136 +117,93 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox4">
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox4">
+            <property name="visible">True</property>
+            <property name="spacing">4</property>
+            <child>
+              <object class="GtkColorButton" id="color-startgradient">
                 <property name="visible">True</property>
-                <property name="spacing">4</property>
-                <child>
-                  <object class="GtkColorButton" id="color-startgradient">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="color">#000000000000</property>
-                    <signal name="color_set" handler="ease_background_widget_on_color_set"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkColorButton" id="color-endgradient">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="color">#000000000000</property>
-                    <signal name="color_set" handler="ease_background_widget_on_color_set"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBox" id="combo-gradient">
-                    <property name="height_request">30</property>
-                    <property name="visible">True</property>
-                    <signal name="changed" handler="ease_background_widget_on_gradient_type_changed"/>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="color">#000000000000</property>
+                <signal name="color_set" handler="ease_background_widget_on_color_set"/>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button-reverse">
-                <property name="label" translatable="yes">Reverse Gradient</property>
-                <property name="height_request">30</property>
+              <object class="GtkColorButton" id="color-endgradient">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="xalign">0</property>
-                <signal name="clicked" handler="ease_background_widget_on_reverse_gradient"/>
+                <property name="color">#000000000000</property>
+                <signal name="color_set" handler="ease_background_widget_on_color_set"/>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkComboBox" id="combo-gradient">
+                <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="spacing">2</property>
-                <child>
-                  <object class="GtkHBox" id="hbox5">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkLabel" id="label-angle">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Gradient Angle</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <signal name="changed" handler="ease_background_widget_on_gradient_type_changed"/>
                 <child>
-                  <object class="GtkHScale" id="hscale-angle">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="update_policy">discontinuous</property>
-                    <property name="adjustment">adjustment-angle</property>
-                    <property name="draw_value">False</property>
-                    <signal name="value_changed" handler="ease_background_widget_on_set_angle"/>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
+                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                  <attributes>
+                    <attribute name="text">0</attribute>
+                  </attributes>
                 </child>
               </object>
               <packing>
-                <property name="padding">10</property>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button-reverse">
+            <property name="label" translatable="yes">Reverse Gradient</property>
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="xalign">0</property>
+            <signal name="clicked" handler="ease_background_widget_on_reverse_gradient"/>
+          </object>
+          <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox-image">
-            <property name="spacing">4</property>
+          <object class="GtkVBox" id="vbox2">
+            <property name="visible">True</property>
+            <property name="spacing">2</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox5">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel" id="image-label">
+                  <object class="GtkLabel" id="label-angle">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Background Image</property>
+                    <property name="label" translatable="yes">Gradient Angle</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -273,68 +222,114 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFileChooserButton" id="button-image">
-                <property name="height_request">30</property>
+              <object class="GtkHScale" id="hscale-angle">
                 <property name="visible">True</property>
-                <signal name="file_set" handler="ease_background_widget_on_file_set"/>
+                <property name="can_focus">True</property>
+                <property name="update_policy">discontinuous</property>
+                <property name="adjustment">adjustment-angle</property>
+                <property name="draw_value">False</property>
+                <signal name="value_changed" handler="ease_background_widget_on_set_angle"/>
               </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="padding">10</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="vbox-image">
+        <property name="spacing">4</property>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
             <child>
-              <object class="GtkHBox" id="hbox6">
+              <object class="GtkLabel" id="image-label">
                 <property name="visible">True</property>
-                <child>
-                  <object class="GtkLabel" id="image-label1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Fill Mode</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">Background Image</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBox" id="image-fill">
-                <property name="height_request">30</property>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFileChooserButton" id="button-image">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <signal name="file_set" handler="ease_background_widget_on_file_set"/>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="hbox6">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" id="image-label1">
                 <property name="visible">True</property>
-                <signal name="changed" handler="ease_background_widget_on_image_fill_changed"/>
-                <child>
-                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                  <attributes>
-                    <attribute name="text">0</attribute>
-                  </attributes>
-                </child>
+                <property name="label" translatable="yes">Fill Mode</property>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBox" id="image-fill">
+            <property name="height_request">30</property>
+            <property name="visible">True</property>
+            <signal name="changed" handler="ease_background_widget_on_image_fill_changed"/>
+            <child>
+              <object class="GtkCellRendererText" id="cellrenderertext2"/>
+              <attributes>
+                <attribute name="text">0</attribute>
+              </attributes>
+            </child>
+          </object>
+          <packing>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">3</property>
+      </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment-angle">
-    <property name="upper">6.2800000000000002</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">1</property>
-  </object>
 </interface>
diff --git a/ease-core/ease-background-widget.vala b/ease-core/ease-background-widget.vala
index 41e4794..8dad770 100644
--- a/ease-core/ease-background-widget.vala
+++ b/ease-core/ease-background-widget.vala
@@ -97,7 +97,7 @@ public class Ease.BackgroundWidget : Gtk.Alignment
 		
 		// add the root of the builder file to this widget
 		add(builder.get_object("root") as Gtk.Widget);
-		set(0, 1, 0, 0);
+		set(0, 0, 1, 0);
 		
 		// get controls
 		box_color = builder.get_object("vbox-color") as Gtk.VBox;