- IDE: put the create package & create source file buttons in more logical places

- IDE: improve styleability

DrawableGui/src/main/java/org/openzen/drawablegui/DHorizontalLayout.java

@@ -10,7 +10,6 @@ import java.util.function.Predicate;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.MutableLiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 
@@ -99,6 +98,7 @@ public class DHorizontalLayout extends BaseComponentGroup {
 
 	@Override
 	public void paint(DCanvas canvas) {
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		for (Element element : components) {
 			element.component.paint(canvas);
 		}
@@ -222,21 +222,21 @@ public class DHorizontalLayout extends BaseComponentGroup {
 		int y;
 		switch (element.alignment) {
 			case BOTTOM:
-				height = Math.min(preferences.preferredHeight, bounds.height - style.paddingTop - style.paddingBottom);
-				y = bounds.y + style.paddingTop;
+				height = Math.min(preferences.preferredHeight, bounds.height - style.border.getPaddingVertical());
+				y = bounds.y + style.border.getPaddingTop();
 				break;
 			case MIDDLE:
-				height = Math.min(preferences.preferredHeight, bounds.height - style.paddingTop - style.paddingBottom);
-				y = bounds.y + style.paddingTop + (bounds.height - style.paddingTop - style.paddingBottom - height) / 2;
+				height = Math.min(preferences.preferredHeight, bounds.height - style.border.getPaddingVertical());
+				y = bounds.y + style.border.getPaddingTop() + (bounds.height - style.border.getPaddingVertical() - height) / 2;
 				break;
 			case TOP:
-				height = Math.min(preferences.preferredHeight, bounds.height - style.paddingTop - style.paddingBottom);
-				y = bounds.y + bounds.height - style.paddingBottom - height;
+				height = Math.min(preferences.preferredHeight, bounds.height - style.border.getPaddingVertical());
+				y = bounds.y + bounds.height - style.border.getPaddingBottom() - height;
 				break;
 			case STRETCH:
 			default:
-				height = bounds.height - style.paddingTop - style.paddingBottom;
-				y = bounds.y + style.paddingTop;
+				height = bounds.height - style.border.getPaddingVertical();
+				y = bounds.y + style.border.getPaddingTop();
 				break;
 		}
 		element.component.setBounds(new DIRectangle(x, y, width, height));
@@ -261,13 +261,15 @@ public class DHorizontalLayout extends BaseComponentGroup {
 			maximumHeight = Math.min(maximumHeight, preferences.maximumHeight);
 		}
 		
+		int paddingHorizontal = style.border.getPaddingHorizontal();
+		int paddingVertical = style.border.getPaddingVertical();
 		DSizing preferences = new DSizing(
-				minimumWidth + style.paddingLeft + style.paddingRight,
-				minimumHeight + style.paddingTop + style.paddingBottom,
-				preferredWidth + style.paddingLeft + style.paddingRight,
-				preferredHeight + style.paddingTop + style.paddingBottom,
-				maximumWidth + style.paddingLeft + style.paddingRight,
-				maximumHeight + style.paddingTop + style.paddingBottom);
+				minimumWidth + paddingHorizontal,
+				minimumHeight + paddingVertical,
+				preferredWidth + paddingHorizontal,
+				preferredHeight + paddingVertical,
+				maximumWidth + paddingHorizontal,
+				maximumHeight + paddingVertical);
 		sizing.setValue(preferences);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DHorizontalLayoutStyle.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.border.DBorder;
+import org.openzen.drawablegui.border.DPaddedBorder;
 import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
@@ -14,18 +16,12 @@ import org.openzen.drawablegui.style.DStyleDefinition;
  */
 public class DHorizontalLayoutStyle {
 	public final int spacing;
-	
-	public final int paddingTop;
-	public final int paddingLeft;
-	public final int paddingRight;
-	public final int paddingBottom;
+	public final DBorder border;
+	public final int backgroundColor;
 	
 	public DHorizontalLayoutStyle(DStyleDefinition style) {
 		spacing = style.getDimension("spacing", new DDpDimension(8));
-		
-		paddingTop = style.getDimension("paddingTop", new DDpDimension(8));
-		paddingLeft = style.getDimension("paddingLeft", new DDpDimension(8));
-		paddingRight = style.getDimension("paddingRight", new DDpDimension(8));
-		paddingBottom = style.getDimension("paddingBottom", new DDpDimension(8));
+		border = style.getBorder("border", context -> new DPaddedBorder(context.dp(8)));
+		backgroundColor = style.getColor("backgroundColor", 0);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltip.java

@@ -57,8 +57,6 @@ public class DSimpleTooltip {
 	}
 	
 	private void show() {
-		System.out.println("Show tooltip");
-		
 		DSimpleTooltipComponent view = new DSimpleTooltipComponent(styleClass, tooltip);
 		window = context.openView(enterMouseX, enterMouseY + context.dp(8), DAnchor.TOP_LEFT, view);
 		
@@ -69,8 +67,6 @@ public class DSimpleTooltip {
 	}
 	
 	private void hide() {
-		System.out.println("Hide tooltip");
-		
 		if (window != null) {
 			window.close();
 			window = null;

DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltipComponent.java

@@ -78,7 +78,6 @@ public class DSimpleTooltipComponent implements DComponent {
 	
 	@Override
 	public void paint(DCanvas canvas) {
-		System.out.println("Actually paint tooltip");
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		style.border.paint(canvas, bounds);
 		canvas.drawText(

DrawableGui/src/main/java/org/openzen/drawablegui/DVerticalLayout.java

@@ -26,7 +26,7 @@ public class DVerticalLayout extends BaseComponentGroup {
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	
 	private DUIContext context;
-	private DHorizontalLayoutStyle style;
+	private DVerticalLayoutStyle style;
 	private DIRectangle bounds;
 	private float totalGrow;
 	private float totalShrink;
@@ -68,12 +68,10 @@ public class DVerticalLayout extends BaseComponentGroup {
 		this.context = context;
 		
 		DStylePath path = parent.getChild("verticalLayout", styleClass);
-		style = new DHorizontalLayoutStyle(context.getStylesheets().get(context, path));
+		style = new DVerticalLayoutStyle(context.getStylesheets().get(context, path));
 		
 		for (Element element : components)
 			element.component.setContext(parent, context);
-		
-		layout();
 	}
 
 	@Override
@@ -99,6 +97,7 @@ public class DVerticalLayout extends BaseComponentGroup {
 
 	@Override
 	public void paint(DCanvas canvas) {
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		for (Element element : components) {
 			element.component.paint(canvas);
 		}
@@ -222,21 +221,21 @@ public class DVerticalLayout extends BaseComponentGroup {
 		int width;
 		switch (element.alignment) {
 			case LEFT:
-				width = Math.min(preferences.preferredWidth, bounds.width - style.paddingLeft - style.paddingRight);
-				x = bounds.x + style.paddingLeft;
+				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
+				x = bounds.x + style.border.getPaddingLeft();
 				break;
 			case CENTER:
-				width = Math.min(preferences.preferredWidth, bounds.width - style.paddingLeft - style.paddingRight);
-				x = bounds.x + style.paddingLeft + (bounds.width - style.paddingLeft - style.paddingRight - width) / 2;
+				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
+				x = bounds.x + style.border.getPaddingLeft() + (bounds.width - style.border.getPaddingHorizontal() - width) / 2;
 				break;
 			case RIGHT:
-				width = Math.min(preferences.preferredWidth, bounds.width - style.paddingLeft - style.paddingRight);
-				x = bounds.x + bounds.width - style.paddingLeft - width;
+				width = Math.min(preferences.preferredWidth, bounds.width - style.border.getPaddingHorizontal());
+				x = bounds.x + bounds.width - style.border.getPaddingLeft() - width;
 				break;
 			case STRETCH:
 			default:
-				width = bounds.width - style.paddingLeft - style.paddingRight;
-				x = bounds.x + style.paddingLeft;
+				width = bounds.width - style.border.getPaddingHorizontal();
+				x = bounds.x + style.border.getPaddingLeft();
 				break;
 		}
 		element.component.setBounds(new DIRectangle(x, y, width, height));
@@ -262,13 +261,15 @@ public class DVerticalLayout extends BaseComponentGroup {
 			maximumHeight += preferences.maximumHeight + style.spacing;
 		}
 		
+		int paddingHorizontal = style.border.getPaddingHorizontal();
+		int paddingVertical = style.border.getPaddingVertical();
 		DSizing preferences = new DSizing(
-				minimumWidth + style.paddingLeft + style.paddingRight,
-				minimumHeight + style.paddingTop + style.paddingBottom,
-				preferredWidth + style.paddingLeft + style.paddingRight,
-				preferredHeight + style.paddingTop + style.paddingBottom,
-				maximumWidth + style.paddingLeft + style.paddingRight,
-				maximumHeight + style.paddingTop + style.paddingBottom);
+				minimumWidth + paddingHorizontal,
+				minimumHeight + paddingVertical,
+				preferredWidth + paddingHorizontal,
+				preferredHeight + paddingVertical,
+				maximumWidth + paddingHorizontal,
+				maximumHeight + paddingVertical);
 		sizing.setValue(preferences);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DVerticalLayoutStyle.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.border.DBorder;
+import org.openzen.drawablegui.border.DPaddedBorder;
 import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DStyleDefinition;
 
@@ -14,18 +16,12 @@ import org.openzen.drawablegui.style.DStyleDefinition;
  */
 public class DVerticalLayoutStyle {
 	public final int spacing;
-	
-	public final int paddingTop;
-	public final int paddingLeft;
-	public final int paddingRight;
-	public final int paddingBottom;
+	public final DBorder border;
+	public final int backgroundColor;
 	
 	public DVerticalLayoutStyle(DStyleDefinition style) {
 		spacing = style.getDimension("spacing", new DDpDimension(8));
-		
-		paddingTop = style.getDimension("paddingTop", new DDpDimension(8));
-		paddingLeft = style.getDimension("paddingLeft", new DDpDimension(8));
-		paddingRight = style.getDimension("paddingRight", new DDpDimension(8));
-		paddingBottom = style.getDimension("paddingBottom", new DDpDimension(8));
+		border = style.getBorder("border", context -> new DPaddedBorder(context.dp(8)));
+		backgroundColor = style.getColor("backgroundColor", 0);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/border/DBorder.java

@@ -22,4 +22,12 @@ public interface DBorder {
 	public int getPaddingTop();
 	
 	public int getPaddingBottom();
+	
+	default int getPaddingHorizontal() {
+		return getPaddingLeft() + getPaddingRight();
+	}
+	
+	default int getPaddingVertical() {
+		return getPaddingTop() + getPaddingBottom();
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/border/DPaddedBorder.java

@@ -24,6 +24,10 @@ public class DPaddedBorder implements DBorder {
 		this.right = right;
 		this.bottom = bottom;
 	}
+	
+	public DPaddedBorder(int size) {
+		this(size, size, size, size);
+	}
 
 	@Override
 	public void paint(DCanvas canvas, DIRectangle bounds) {

DrawableGui/src/main/java/org/openzen/drawablegui/style/DBorderElement.java

@@ -0,0 +1,22 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.border.DBorder;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DBorderElement extends DStyleElement {
+	DBorder eval(DUIContext context);
+	
+	@Override
+	default DBorderElement asBorder() {
+		return this;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DColorElement.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DColorElement implements DStyleElement {
+	private final int color;
+	
+	public DColorElement(int color) {
+		this.color = color;
+	}
+	
+	@Override
+	public int asColor() {
+		return color;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DDimension.java

@@ -11,10 +11,15 @@ import org.openzen.drawablegui.DUIContext;
  *
  * @author Hoofdgebruiker
  */
-public interface DDimension {
+public interface DDimension extends DStyleElement {
 	float eval(DUIContext context);
 	
 	default int evalInt(DUIContext context) {
 		return (int)(eval(context) + 0.5f);
 	}
+	
+	@Override
+	default DDimension asDimension() {
+		return this;
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DEmptyStyleDefinition.java

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.style;
 
-import java.util.function.Function;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.border.DBorder;
@@ -37,17 +36,17 @@ public class DEmptyStyleDefinition implements DStyleDefinition {
 	}
 
 	@Override
-	public DShadow getShadow(String name, Function<DUIContext, DShadow> defaultValue) {
-		return defaultValue.apply(context);
+	public DShadow getShadow(String name, DShadowElement defaultValue) {
+		return defaultValue.eval(context);
 	}
 
 	@Override
-	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue) {
-		return defaultValue.apply(context);
+	public DFont getFont(String name, DFontElement defaultValue) {
+		return defaultValue.eval(context);
 	}
 
 	@Override
-	public DBorder getBorder(String name, Function<DUIContext, DBorder> defaultValue) {
-		return defaultValue.apply(context);
+	public DBorder getBorder(String name, DBorderElement defaultValue) {
+		return defaultValue.eval(context);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DEmptyStylesheet.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DEmptyStylesheet implements DStylesheet {
+	public static final DEmptyStylesheet INSTANCE = new DEmptyStylesheet();
+	
+	private DEmptyStylesheet() {}
+
+	@Override
+	public DStyleDefinition getInstance(DUIContext context) {
+		return new DEmptyStyleDefinition(context);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DEmptyStylesheets.java

@@ -16,6 +16,6 @@ public class DEmptyStylesheets implements DStyleSheets {
 
 	@Override
 	public DStyleDefinition get(DUIContext context, DStylePath path) {
-		return new DEmptyStyleDefinition(context);
+		return path.getInline(context);
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DFontElement.java

@@ -0,0 +1,23 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+@FunctionalInterface
+public interface DFontElement extends DStyleElement {
+	DFont eval(DUIContext context);
+	
+	@Override
+	default DFontElement asFont() {
+		return this;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DShadowElement.java

@@ -0,0 +1,21 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DShadowElement extends DStyleElement {
+	DShadow eval(DUIContext context);
+	
+	@Override
+	default DShadowElement asShadow() {
+		return this;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DSimpleStylesheet.java

@@ -0,0 +1,84 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import java.util.Map;
+import org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.border.DBorder;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DSimpleStylesheet implements DStylesheet {
+	private final Map<String, DStyleElement> elements;
+	
+	public DSimpleStylesheet(Map<String, DStyleElement> elements) {
+		this.elements = elements;
+	}
+
+	@Override
+	public DStyleDefinition getInstance(DUIContext context) {
+		return new Instance(context);
+	}
+	
+	private class Instance implements DStyleDefinition {
+		private final DUIContext context;
+		
+		private Instance(DUIContext context) {
+			this.context = context;
+		}
+
+		@Override
+		public int getDimension(String name, DDimension defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.evalInt(context);
+			
+			return elements.get(name).asDimension().evalInt(context);
+		}
+
+		@Override
+		public float getFloatDimension(String name, DDimension defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.eval(context);
+			
+			return elements.get(name).asDimension().eval(context);
+		}
+
+		@Override
+		public int getColor(String name, int defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue;
+			
+			return elements.get(name).asColor();
+		}
+
+		@Override
+		public DShadow getShadow(String name, DShadowElement defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.eval(context);
+			
+			return elements.get(name).asShadow().eval(context);
+		}
+
+		@Override
+		public DFont getFont(String name, DFontElement defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.eval(context);
+			
+			return elements.get(name).asFont().eval(context);
+		}
+
+		@Override
+		public DBorder getBorder(String name, DBorderElement defaultValue) {
+			if (!elements.containsKey(name))
+				return defaultValue.eval(context);
+			
+			return elements.get(name).asBorder().eval(context);
+		}
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleClass.java

@@ -11,17 +11,23 @@ package org.openzen.drawablegui.style;
  */
 public class DStyleClass {
 	private static final String[] NO_CLASSES = new String[0];
-	public static final DStyleClass EMPTY = new DStyleClass(null, NO_CLASSES);
+	public static final DStyleClass EMPTY = new DStyleClass(null, NO_CLASSES, DEmptyStylesheet.INSTANCE);
 	
 	public static DStyleClass forId(String id) {
-		return new DStyleClass(id, NO_CLASSES);
+		return new DStyleClass(id, NO_CLASSES, DEmptyStylesheet.INSTANCE);
+	}
+	
+	public static DStyleClass inline(DStylesheet stylesheet) {
+		return new DStyleClass(null, NO_CLASSES, stylesheet);
 	}
 	
 	public final String id;
 	public final String[] classes;
+	public final DStylesheet inline;
 	
-	public DStyleClass(String id, String[] classes) {
+	public DStyleClass(String id, String[] classes, DStylesheet inline) {
 		this.id = id;
 		this.classes = classes;
+		this.inline = inline;
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleDefinition.java

@@ -5,9 +5,7 @@
  */
 package org.openzen.drawablegui.style;
 
-import java.util.function.Function;
 import org.openzen.drawablegui.DFont;
-import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.border.DBorder;
 
 /**
@@ -21,9 +19,9 @@ public interface DStyleDefinition {
 	
 	public int getColor(String name, int defaultValue);
 	
-	public DShadow getShadow(String name, Function<DUIContext, DShadow> defaultValue);
+	public DShadow getShadow(String name, DShadowElement defaultValue);
 	
-	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue);
+	public DFont getFont(String name, DFontElement defaultValue);
 	
-	public DBorder getBorder(String name, Function<DUIContext, DBorder> defaultValue);
+	public DBorder getBorder(String name, DBorderElement defaultValue);
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleElement.java

@@ -0,0 +1,37 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import java.util.function.Function;
+import org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.border.DBorder;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DStyleElement {
+	default DDimension asDimension() {
+		throw new RuntimeException("Not a dimension!");
+	}
+	
+	default int asColor() {
+		throw new RuntimeException("Not a color!");
+	}
+	
+	default DFontElement asFont() {
+		throw new RuntimeException("Not a font!");
+	}
+	
+	default DBorderElement asBorder() {
+		throw new RuntimeException("Not a border!");
+	}
+	
+	default DShadowElement asShadow() {
+		throw new RuntimeException("Not a shadow!");
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylePath.java

@@ -5,10 +5,14 @@
  */
 package org.openzen.drawablegui.style;
 
+import org.openzen.drawablegui.DUIContext;
+
 /**
  *
  * @author Hoofdgebruiker
  */
 public interface DStylePath {
 	public DStylePath getChild(String element, DStyleClass styleClass);
+	
+	public DStyleDefinition getInline(DUIContext context);
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylePathRoot.java

@@ -5,6 +5,8 @@
  */
 package org.openzen.drawablegui.style;
 
+import org.openzen.drawablegui.DUIContext;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -19,6 +21,11 @@ public class DStylePathRoot implements DStylePath {
 		return new DStyleChildElement(this, element, styleClass);
 	}
 	
+	@Override
+	public DStyleDefinition getInline(DUIContext context) {
+		return new DEmptyStyleDefinition(context);
+	}
+	
 	private static class DStyleChildElement implements DStylePath {
 		private final DStylePath parent;
 		private final String element;
@@ -34,5 +41,10 @@ public class DStylePathRoot implements DStylePath {
 		public DStylePath getChild(String element, DStyleClass styleClass) {
 			return new DStyleChildElement(this, element, styleClass);
 		}
+
+		@Override
+		public DStyleDefinition getInline(DUIContext context) {
+			return styleClass.inline.getInstance(context);
+		}
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylesheet.java

@@ -0,0 +1,16 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DStylesheet {
+	DStyleDefinition getInstance(DUIContext context);
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylesheetBuilder.java

@@ -0,0 +1,56 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.openzen.drawablegui.style;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DStylesheetBuilder {
+	private final Map<String, DStyleElement> elements = new HashMap<>();
+	
+	public DStylesheetBuilder dimensionDp(String name, float value) {
+		elements.put(name, new DDpDimension(value));
+		return this;
+	}
+	
+	public DStylesheetBuilder dimensionPx(String name, float value) {
+		elements.put(name, new DPxDimension(value));
+		return this;
+	}
+	
+	public DStylesheetBuilder dimensionSp(String name, float value) {
+		elements.put(name, new DSpDimension(value));
+		return this;
+	}
+	
+	public DStylesheetBuilder color(String name, int value) {
+		elements.put(name, new DColorElement(value));
+		return this;
+	}
+	
+	public DStylesheetBuilder font(String name, DFontElement font) {
+		elements.put(name, font);
+		return this;
+	}
+	
+	public DStylesheetBuilder shadow(String name, DShadowElement shadow) {
+		elements.put(name, shadow);
+		return this;
+	}
+	
+	public DStylesheetBuilder border(String name, DBorderElement border) {
+		elements.put(name, border);
+		return this;
+	}
+	
+	public DStylesheet build() {
+		return new DSimpleStylesheet(elements);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/swing/SwingRoot.java

@@ -77,7 +77,6 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 			firstPaint = false;
 			component.setContext(DStylePathRoot.INSTANCE, context);
 			component.setBounds(new DIRectangle(0, 0, getWidth(), getHeight()));
-			System.out.println("Painting with size " + getWidth() + " x " + getHeight());
 		}
 		
 		Rectangle clipBounds = g.getClipBounds();

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEWindow.java

@@ -38,10 +38,10 @@ public class IDEWindow {
 	
 	public IDEAspectToolbar projectToolbar;
 	
-	private final MutableLiveObject<IDEModule> contextModule = new SimpleLiveObject<>(null);
-	private final MutableLiveObject<IDEPackage> contextPackage = new SimpleLiveObject<>(null);
-	private final MutableLiveObject<IDESourceFile> contextFile = new SimpleLiveObject<>(null);
-	private final LiveBool addContentDisabled = new LivePredicateBool(contextPackage, pkg -> pkg == null);
+	public final MutableLiveObject<IDEModule> contextModule = new SimpleLiveObject<>(null);
+	public final MutableLiveObject<IDEPackage> contextPackage = new SimpleLiveObject<>(null);
+	public final MutableLiveObject<IDESourceFile> contextFile = new SimpleLiveObject<>(null);
+	public final LiveBool addContentDisabled = new LivePredicateBool(contextPackage, pkg -> pkg == null);
 	
 	public IDEWindow(DevelopmentHost host) {
 		this.host = host;
@@ -67,14 +67,6 @@ public class IDEWindow {
 	
 	private void init() {
 		projectToolbar = new IDEAspectToolbar(0, ShadedProjectIcon.PURPLE, "Project", "Project management");
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLUE, AddBoxIcon.GRAY, addContentDisabled, new ImmutableLiveString("Create package"), e -> {
-			CreatePackageDialog dialog = new CreatePackageDialog(this, contextModule.getValue(), contextPackage.getValue());
-			dialog.open(e.window);
-		}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.ORANGE, AddBoxIcon.GRAY, addContentDisabled, new ImmutableLiveString("Create source file"), e -> {
-			CreateSourceFileDialog dialog = new CreateSourceFileDialog(this, contextModule.getValue(), contextPackage.getValue());
-			dialog.open(e.window);
-		}));
 		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.PURPLE, new ImmutableLiveString("Project settings"), e -> {
 			
 		}));

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreatePackageDialog.java

@@ -30,7 +30,6 @@ import org.openzen.zenscript.ide.ui.IDEWindow;
  * @author Hoofdgebruiker
  */
 public class CreatePackageDialog {
-	private final IDEWindow ideWindow;
 	private final IDEModule module;
 	private final IDEPackage pkg;
 	
@@ -41,8 +40,7 @@ public class CreatePackageDialog {
 	
 	private DUIWindow window;
 	
-	public CreatePackageDialog(IDEWindow ideWindow, IDEModule module, IDEPackage pkg) {
-		this.ideWindow = ideWindow;
+	public CreatePackageDialog(IDEModule module, IDEPackage pkg) {
 		this.module = module;
 		this.pkg = pkg;
 		

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/WindowView.java

@@ -7,17 +7,25 @@ package org.openzen.zenscript.ide.ui.view;
 
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DEmptyView;
+import org.openzen.drawablegui.DHorizontalLayout;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.DSideLayout;
+import org.openzen.drawablegui.DVerticalLayout;
+import org.openzen.drawablegui.border.DEmptyBorder;
+import org.openzen.drawablegui.live.ImmutableLiveString;
 import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylesheetBuilder;
 import org.openzen.drawablegui.tree.DTreeView;
 import org.openzen.drawablegui.tree.DTreeViewStyle;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEDockWindow;
 import org.openzen.zenscript.ide.ui.IDEWindow;
+import org.openzen.zenscript.ide.ui.dialog.CreatePackageDialog;
+import org.openzen.zenscript.ide.ui.dialog.CreateSourceFileDialog;
+import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
 import org.openzen.zenscript.ide.ui.view.aspectbar.AspectBarView;
 import org.openzen.zenscript.ide.ui.view.editor.SourceEditor;
 import org.openzen.zenscript.ide.ui.view.project.RootTreeNode;
@@ -35,10 +43,55 @@ public final class WindowView extends DSideLayout {
 		super(DStyleClass.EMPTY, DEmptyView.INSTANCE);
 		this.window = window;
 		
-		DTreeView projectView = new DTreeView(DTreeViewStyle.DEFAULT, new RootTreeNode(window, host), false);
-		projectView.getSizing().setValue(new DSizing(500, 500));
+		DStyleClass minimalButtonPadding = DStyleClass.inline(new DStylesheetBuilder()
+				.dimensionDp("margin", 3)
+				.dimensionDp("padding", 0)
+				.build());
+		
+		IconButtonControl addPackageButton = new IconButtonControl(
+				minimalButtonPadding,
+				AddBoxIcon.BLUE,
+				AddBoxIcon.GRAY,
+				window.addContentDisabled,
+				new ImmutableLiveString("Create package"),
+				e -> {
+					CreatePackageDialog dialog = new CreatePackageDialog(window.contextModule.getValue(), window.contextPackage.getValue());
+					dialog.open(e.window);
+				});
+		IconButtonControl addFileButton = new IconButtonControl(
+				minimalButtonPadding,
+				AddBoxIcon.ORANGE,
+				AddBoxIcon.GRAY,
+				window.addContentDisabled,
+				new ImmutableLiveString("Create source file"),
+				e -> {
+					CreateSourceFileDialog dialog = new CreateSourceFileDialog(window, window.contextModule.getValue(), window.contextPackage.getValue());
+					dialog.open(e.window);
+				});
+		
+		DHorizontalLayout toolbar = new DHorizontalLayout(
+				DStyleClass.inline(new DStylesheetBuilder()
+						.border("border", context -> DEmptyBorder.INSTANCE)
+						.dimensionPx("spacing", 0)
+						.color("backgroundColor", 0xFFFFFFFF)
+						.build()),
+				DHorizontalLayout.Alignment.LEFT,
+				new DHorizontalLayout.Element(addPackageButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP),
+				new DHorizontalLayout.Element(addFileButton, 0, 0, DHorizontalLayout.ElementAlignment.TOP));
+		DTreeView projectTree = new DTreeView(DTreeViewStyle.DEFAULT, new RootTreeNode(window, host), false);
+		projectTree.getSizing().setValue(new DSizing(500, 500));
+		
+		DVerticalLayout projectView = new DVerticalLayout(
+				DStyleClass.inline(new DStylesheetBuilder()
+						.border("border", context -> DEmptyBorder.INSTANCE)
+						.dimensionPx("spacing", 0)
+						.build()),
+				DVerticalLayout.Alignment.TOP,
+				new DVerticalLayout.Element(toolbar, 0, 0, DVerticalLayout.ElementAlignment.STRETCH),
+				new DVerticalLayout.Element(new DScrollPane(DStyleClass.forId("projectView"), projectTree), 1, 1, DVerticalLayout.ElementAlignment.STRETCH));
+		
 		setMain(tabs = new TabbedView(DStyleClass.EMPTY));
-		add(Side.LEFT, new DScrollPane(DStyleClass.forId("projectView"), projectView));
+		add(Side.LEFT,projectView);
 		add(Side.BOTTOM, new StatusBarView(DStyleClass.EMPTY, status));
 		add(Side.TOP, new AspectBarView(DStyleClass.EMPTY, window.aspectBar));