X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fgui%2FControlledPane.java;h=19b9fac9815ad78f8943f236cfe1a5512313c365;hb=09f8bd2297dc864e24baa67c65be97104e00c320;hp=cfc5f832ba83291547e317e51b590eff6a027c16;hpb=0d21261bc2ce53628a1d19749519a2c479bb06c0;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/gui/ControlledPane.java b/src/main/java/net/pterodactylus/sonitus/gui/ControlledPane.java
index cfc5f83..19b9fac 100644
--- a/src/main/java/net/pterodactylus/sonitus/gui/ControlledPane.java
+++ b/src/main/java/net/pterodactylus/sonitus/gui/ControlledPane.java
@@ -17,13 +17,17 @@
 
 package net.pterodactylus.sonitus.gui;
 
-import javax.swing.Box;
-import javax.swing.BoxLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 
 import net.pterodactylus.sonitus.data.Controlled;
 import net.pterodactylus.sonitus.data.Controller;
 import net.pterodactylus.sonitus.data.controller.Fader;
+import net.pterodactylus.sonitus.data.controller.Knob;
 import net.pterodactylus.sonitus.data.controller.Switch;
 
 /**
@@ -41,15 +45,22 @@ public class ControlledPane extends JPanel {
 	 * 		The controlled whose controllers to display
 	 */
 	public ControlledPane(Controlled controlled) {
-		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+		super(new GridBagLayout());
+		setBorder(BorderFactory.createEmptyBorder(6, 12, 12, 12));
+
+		int controllerIndex = 0;
 		for (Controller controller : controlled.controllers()) {
+			add(new JLabel(controller.name()), new GridBagConstraints(0, controllerIndex, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(6, 0, 0, 6), 0, 0));
 			if (controller instanceof Fader) {
-				add(new FaderPanel((Fader) controller));
+				add(new FaderPanel((Fader) controller), new GridBagConstraints(1, controllerIndex, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(6, 0, 0, 0), 0, 0));
 			} else if (controller instanceof Switch) {
-				add(new SwitchPanel((Switch) controller));
+				add(new SwitchPanel((Switch) controller), new GridBagConstraints(1, controllerIndex, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(6, 0, 0, 0), 0, 0));
+			} else if (controller instanceof Knob) {
+				add(new KnobPanel((Knob) controller), new GridBagConstraints(1, controllerIndex, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(6, 0, 0, 0), 0, 0));
 			}
+			++controllerIndex;
 		}
-		add(Box.createGlue());
+		add(new JPanel(), new GridBagConstraints(0, controllerIndex, 2, 1, 0.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(6, 0, 0, 0), 0, 0));
 	}
 
 }