# HG changeset patch -- Bitbucket.org
# Project placebohttp
# URL http://bitbucket.org/xitiomet/placebohttp/overview
# User xitiomet
# Date 1260409178 18000
# Node ID 8b48faa4e88d0100e74f6cee9a3cd0af0d9c88d1
# Parent  2701ebc61574aa9ed57466cb3f39d621dea0232f
Fixed layout of ControlPanel

--- a/src/org/openstatic/placebo/ControlPanel.java
+++ b/src/org/openstatic/placebo/ControlPanel.java
@@ -5,6 +5,8 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JTextField;
 import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+import javax.swing.ScrollPaneConstants;
 import java.awt.GridLayout;
 import java.awt.FlowLayout;
 import java.awt.Toolkit;
@@ -34,7 +36,7 @@ public class ControlPanel extends JFrame
         
         JTabbedPane tabbed = new JTabbedPane();
         
-        JPanel main_pane = new JPanel(new GridLayout(0,2,6,6));
+        JPanel main_pane = new JPanel();
         // Left Side thingy
         JPanel pane = new JPanel(new GridLayout(0,2,6,6));
         pane.setSize(50,100);
@@ -51,14 +53,21 @@ public class ControlPanel extends JFrame
         pane.add(port_field);
         pane.add(root_label);
         pane.add(root_field);
-        pane.add(start_btn);
-        pane.add(stop_btn);
+        main_pane.add(pane);
+        
+        JPanel button_pane = new JPanel(new GridLayout(0,2,6,6));
+        button_pane.add(start_btn);
+        button_pane.add(stop_btn);
+        main_pane.add(button_pane);
 
-        tabbed.addTab("Setup Placebo", null, pane, "");
+        tabbed.addTab("Setup Placebo", null, main_pane, "");
         
         // Right Side
+
         JTextArea log_box = new JTextArea();
-        tabbed.addTab("Server Log", null, log_box, "");
+        JScrollPane scroller = new JScrollPane(log_box);
+        scroller.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+        tabbed.addTab("Server Log", null, scroller, "");
 
         // finish window
         this.add(tabbed);