Fix property window layout

There were spacing issues before

2 files changed, 26 insertions, 16 deletions

diff --git a/tikzit/src/gtk/PropertiesWindow.m b/tikzit/src/gtk/PropertiesWindow.m
index 050c1e5..64948f3 100644
--- a/tikzit/src/gtk/PropertiesWindow.m
+++ b/tikzit/src/gtk/PropertiesWindow.m
@@ -117,24 +117,34 @@ static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesWindow *pan
         /*
          * Graph properties
          */
-        graphPropsBin = gtk_frame_new ("Graph properties");
-        gtk_container_add (GTK_CONTAINER (graphPropsBin), [graphProps widget]);
         gtk_widget_show ([graphProps widget]);
+
+        GtkWidget *graphPropsWidget = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (graphPropsWidget), 6, 6, 6, 6);
+        gtk_container_add (GTK_CONTAINER (graphPropsWidget), [graphProps widget]);
+        gtk_widget_show (graphPropsWidget);
+
+        graphPropsBin = gtk_frame_new ("Graph properties");
         g_object_ref_sink (graphPropsBin);
-        gtk_container_add (GTK_CONTAINER (window), graphPropsBin);
+        gtk_container_add (GTK_CONTAINER (graphPropsBin), graphPropsWidget);
         gtk_widget_show (graphPropsBin);
 
+        gtk_container_add (GTK_CONTAINER (window), graphPropsBin);
+
 
         /*
          * Node properties
          */
         GtkWidget *nodePropsWidget = createPropsPaneWithLabelEntry(nodeProps, &nodeLabelEntry);
+        gtk_container_set_border_width (GTK_CONTAINER (nodePropsWidget), 6);
         g_object_ref_sink (nodeLabelEntry);
+        gtk_widget_show (nodePropsWidget);
+
         nodePropsBin = gtk_frame_new ("Node properties");
         g_object_ref_sink (nodePropsBin);
         gtk_container_add (GTK_CONTAINER (nodePropsBin), nodePropsWidget);
         gtk_widget_show (nodePropsBin);
-        gtk_widget_show (nodePropsWidget);
+
         g_signal_connect (G_OBJECT (nodeLabelEntry),
             "changed",
             G_CALLBACK (node_label_changed_cb),
@@ -144,16 +154,17 @@ static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesWindow *pan
         /*
          * Edge properties
          */
-        GtkBox *edgePropsBox = GTK_BOX (gtk_vbox_new (FALSE, 0));
-	gtk_box_set_spacing (edgePropsBox, 6);
+        gtk_widget_show ([edgeProps widget]);
+
+        GtkBox *edgePropsBox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+        gtk_container_set_border_width (GTK_CONTAINER (edgePropsBox), 6);
+        gtk_widget_show (GTK_WIDGET (edgePropsBox));
+        gtk_box_pack_start (edgePropsBox, [edgeProps widget], TRUE, TRUE, 0);
+
         edgePropsBin = gtk_frame_new ("Edge properties");
         g_object_ref_sink (edgePropsBin);
         gtk_container_add (GTK_CONTAINER (edgePropsBin), GTK_WIDGET (edgePropsBox));
         gtk_widget_show (edgePropsBin);
-        gtk_widget_show (GTK_WIDGET (edgePropsBox));
-
-        gtk_widget_show ([edgeProps widget]);
-        gtk_box_pack_start (edgePropsBox, [edgeProps widget], FALSE, TRUE, 0);
 
         GtkWidget *split = gtk_hseparator_new ();
         gtk_box_pack_start (edgePropsBox, split, FALSE, FALSE, 0);
@@ -162,7 +173,7 @@ static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesWindow *pan
         edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node"));
         g_object_ref_sink (edgeNodeToggle);
         gtk_widget_show (GTK_WIDGET (edgeNodeToggle));
-        gtk_box_pack_start (edgePropsBox, GTK_WIDGET (edgeNodeToggle), FALSE, TRUE, 0);
+        gtk_box_pack_start (edgePropsBox, GTK_WIDGET (edgeNodeToggle), FALSE, FALSE, 0);
         g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)),
             "toggled",
             G_CALLBACK (edge_node_toggled_cb),
@@ -171,7 +182,7 @@ static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesWindow *pan
         edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry);
         g_object_ref_sink (edgeNodePropsWidget);
         g_object_ref_sink (edgeNodeLabelEntry);
-        gtk_box_pack_start (edgePropsBox, edgeNodePropsWidget, FALSE, TRUE, 0);
+        gtk_box_pack_start (edgePropsBox, edgeNodePropsWidget, TRUE, TRUE, 0);
         g_signal_connect (G_OBJECT (edgeNodeLabelEntry),
             "changed",
             G_CALLBACK (edge_node_label_changed_cb),
@@ -519,9 +530,9 @@ static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkE
 
         GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry);
         gtk_widget_show (labelWidget);
-        //                  box   widget          expand fill  pad
-        gtk_box_pack_start (box,  labelWidget,    FALSE, TRUE, 0);
-        gtk_box_pack_start (box,  [props widget], FALSE, TRUE, 0);
+        //                  box   widget          expand fill   pad
+        gtk_box_pack_start (box,  labelWidget,    FALSE, FALSE, 0);
+        gtk_box_pack_start (box,  [props widget], TRUE,  TRUE,  0);
         gtk_widget_show ([props widget]);
         return GTK_WIDGET (box);
 }
diff --git a/tikzit/src/gtk/PropertyListEditor.m b/tikzit/src/gtk/PropertyListEditor.m
index f53ed0f..ba909da 100644
--- a/tikzit/src/gtk/PropertyListEditor.m
+++ b/tikzit/src/gtk/PropertyListEditor.m
@@ -114,7 +114,6 @@ static void remove_clicked_cb (GtkButton *button,
 
         widget = gtk_vbox_new (FALSE, 0);
 	gtk_box_set_spacing (GTK_BOX (widget), 6);
-        gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
         g_object_ref_sink (G_OBJECT (widget));
 
         GtkWidget *listFrame = gtk_frame_new (NULL);