From 08c3207530816bc00efc9d6962eb44c0e9222221 Mon Sep 17 00:00:00 2001
From: Alex Merry <alex.merry@cs.ox.ac.uk>
Date: Fri, 7 Dec 2012 15:12:11 +0000
Subject: Improve toolbox config pane layout

---
 tikzit/src/gtk/ToolBox.h |  1 +
 tikzit/src/gtk/ToolBox.m | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tikzit/src/gtk/ToolBox.h b/tikzit/src/gtk/ToolBox.h
index 547da1a..6d1045a 100644
--- a/tikzit/src/gtk/ToolBox.h
+++ b/tikzit/src/gtk/ToolBox.h
@@ -24,6 +24,7 @@
 @interface ToolBox : NSObject {
     GtkWidget        *window;
     GtkToolItemGroup *toolGroup;
+    GtkWidget        *frame;
     GtkWidget        *configWidgetContainer;
     GtkWidget        *configWidget;
 }
diff --git a/tikzit/src/gtk/ToolBox.m b/tikzit/src/gtk/ToolBox.m
index 9e4fa3b..0b424c4 100644
--- a/tikzit/src/gtk/ToolBox.m
+++ b/tikzit/src/gtk/ToolBox.m
@@ -96,15 +96,23 @@ static void unretain (gpointer data);
                               self);
         }
 
-        configWidgetContainer = gtk_frame_new ("");
-        g_object_ref_sink (configWidgetContainer);
-        gtk_widget_show (configWidgetContainer);
+        frame = gtk_frame_new ("");
+        g_object_ref_sink (frame);
+        gtk_widget_show (frame);
         gtk_box_pack_start (GTK_BOX (mainLayout),
-                            configWidgetContainer,
+                            frame,
                             TRUE,
                             TRUE,
                             0);
 
+        configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+        g_object_ref_sink (configWidgetContainer);
+        gtk_widget_show (configWidgetContainer);
+        gtk_container_add (GTK_CONTAINER (frame),
+                           configWidgetContainer);
+        gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer),
+                                   5, 5, 5, 5);
+
         gtk_widget_show (window);
     }
 
@@ -162,7 +170,7 @@ static void unretain (gpointer data);
             break;
         }
     }
-    gtk_frame_set_label (GTK_FRAME (configWidgetContainer),
+    gtk_frame_set_label (GTK_FRAME (frame),
                          [[tool name] UTF8String]);
     [self _setToolWidget:[tool configurationWidget]];
 }
-- 
cgit v1.2.3