- Removed some unnecessary classes

- Added styling system
- WIP on the aspect bar

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui;
 
-import java.awt.event.MouseWheelEvent;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 

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

@@ -5,6 +5,8 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.listeners.DIRectangle;
+
 /**
  *
  * @author Hoofdgebruiker
@@ -20,16 +22,10 @@ public interface DCanvas {
 	
 	DIRectangle getBounds();
 	
-	DDrawingContext getContext();
+	DUIContext getContext();
 	
 	void drawText(DFont font, int color, float x, float y, String text);
 	
-	default float measureTextLength(DFont font, String text) {
-		return measureTextLength(font, text, 0, text.length());
-	}
-	
-	float measureTextLength(DFont font, String text, int offset, int length);
-	
 	/**
 	 * Strokes a given path.
 	 * 

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

@@ -5,20 +5,23 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.listeners.DIRectangle;
+import java.io.Closeable;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public interface DComponent {
-	void setContext(DDrawingContext context);
+public interface DComponent extends Closeable {
+	void setContext(DStylePath parent, DUIContext context);
 	
 	LiveObject<DDimensionPreferences> getDimensionPreferences();
 	
-	DRectangle getBounds();
+	DIRectangle getBounds();
 	
-	void setBounds(DRectangle bounds);
+	void setBounds(DIRectangle bounds);
 	
 	void paint(DCanvas canvas);
 	
@@ -47,4 +50,7 @@ public interface DComponent {
 	default void onKeyPressed(DKeyEvent e) {}
 	
 	default void onKeyReleased(DKeyEvent e) {}
+	
+	@Override
+	void close();
 }

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

@@ -5,8 +5,10 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.live.ImmutableLiveObject;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
@@ -16,12 +18,12 @@ public class DEmptyView implements DComponent {
 	public static final DEmptyView INSTANCE = new DEmptyView();
 	
 	private static final LiveObject<DDimensionPreferences> DIMENSION = new ImmutableLiveObject(new DDimensionPreferences(0, 0));
-	private static final DRectangle NO_BOUNDS = new DRectangle(0, 0, 0, 0);
+	private static final DIRectangle NO_BOUNDS = new DIRectangle(0, 0, 0, 0);
 	
 	private DEmptyView() {}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		
 	}
 	
@@ -31,12 +33,12 @@ public class DEmptyView implements DComponent {
 	}
 	
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return NO_BOUNDS;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		
 	}
 
@@ -44,4 +46,9 @@ public class DEmptyView implements DComponent {
 	public void paint(DCanvas canvas) {
 		
 	}
+
+	@Override
+	public void close() {
+		// nothing to clean up
+	}
 }

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

@@ -1,24 +0,0 @@
-/*
- * 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;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class DIRectangle {
-	public final int x;
-	public final int y;
-	public final int width;
-	public final int height;
-	
-	public DIRectangle(int x, int y, int width, int height) {
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.height = height;
-	}
-}

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

@@ -10,5 +10,56 @@ package org.openzen.drawablegui;
  * @author Hoofdgebruiker
  */
 public interface DPath {
+	public static DPath circle(float x, float y, float radius) {
+		// see http://spencermortensen.com/articles/bezier-circle/
+		return tracer -> {
+			float c = radius * 0.551915024494f;
+			tracer.moveTo(x, y + radius);
+			tracer.bezierCubic(
+					x + c, y + radius,
+					x + radius, y + c,
+					x + radius, y);
+			tracer.bezierCubic(
+					x + radius, y - c,
+					x + c, y - radius,
+					x, y - radius);
+			tracer.bezierCubic(
+					x - c, y - radius,
+					x - radius, y - c,
+					x - radius, y);
+			tracer.bezierCubic(
+					x - radius, y + c,
+					x - c, y + radius,
+					x, y + radius);
+		};
+	}
+	
+	public static DPath roundedRectangle(float x, float y, float width, float height, float radius) {
+		return tracer -> {
+			float c = radius - radius * 0.551915024494f;
+			tracer.moveTo(x + width - radius, y + height);
+			tracer.bezierCubic(
+					x + width - c, y + height,
+					x + width, y + height - c,
+					x + width, y + height - radius);
+			tracer.lineTo(x + width, y + radius);
+			tracer.bezierCubic(
+					x + width, y + c,
+					x + width - c, y,
+					x + width - radius, y);
+			tracer.lineTo(x + radius, y);
+			tracer.bezierCubic(
+					x + c, y,
+					x, y + c,
+					x, y + radius);
+			tracer.lineTo(x, y + height - radius);
+			tracer.bezierCubic(
+					x, y + height - c,
+					x + c, y + height,
+					x + radius, y + height);
+			tracer.close();
+		};
+	}
+	
 	void trace(DPathTracer tracer);
 }

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

@@ -0,0 +1,72 @@
+/*
+ * 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;
+
+import org.openzen.drawablegui.listeners.DIRectangle;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DPathBoundsCalculator implements DPathTracer {
+	public static DIRectangle getBounds(DPath path, DTransform2D transform) {
+		DPathBoundsCalculator calculator = new DPathBoundsCalculator(transform);
+		path.trace(calculator);
+		return new DIRectangle(
+				(int)calculator.minX,
+				(int)calculator.minY,
+				(int)Math.ceil(calculator.maxX - calculator.minX),
+				(int)Math.ceil(calculator.maxY - calculator.minY));
+	}
+	
+	private final DTransform2D transform;
+	private float minX = Float.MAX_VALUE;
+	private float minY = Float.MAX_VALUE;
+	private float maxX = Float.MIN_VALUE;
+	private float maxY = Float.MIN_VALUE;
+	
+	private DPathBoundsCalculator(DTransform2D transform) {
+		this.transform = transform;
+	}
+	
+	private void add(float x, float y) {
+		float tx = transform.getX(x, y);
+		float ty = transform.getY(x, y);
+		
+		minX = Math.min(minX, tx);
+		minY = Math.min(minY, ty);
+		maxX = Math.max(maxX, tx);
+		maxY = Math.max(maxY, ty);
+	}
+
+	@Override
+	public void moveTo(float x, float y) {
+		add(x, y);
+	}
+
+	@Override
+	public void lineTo(float x, float y) {
+		add(x, y);
+	}
+
+	@Override
+	public void bezierCubic(float x1, float y1, float x2, float y2, float x3, float y3) {
+		add(x1, y1);
+		add(x2, y2);
+		add(x3, y3);
+	}
+
+	@Override
+	public void bezierQuadratic(float x1, float y1, float x2, float y2) {
+		add(x1, y1);
+		add(x2, y2);
+	}
+
+	@Override
+	public void close() {
+		
+	}
+}

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.listeners.DIRectangle;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
@@ -13,47 +14,58 @@ import java.util.function.Predicate;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class DSideLayout extends BaseComponentGroup {
+	private final DStyleClass styleClass;
+	
 	private DComponent main;
 	private final List<SideComponent> sides = new ArrayList<>();
 	private final LiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
 	
-	private DDrawingContext context;
-	private DRectangle bounds;
+	private DStylePath path;
+	private DUIContext context;
+	private DIRectangle bounds;
 	
-	public DSideLayout(DComponent main) {
+	public DSideLayout(DStyleClass styleClass, DComponent main) {
+		this.styleClass = styleClass;
 		this.main = main;
 	}
 	
 	public void add(Side side, DComponent component) {
 		if (context != null)
-			component.setContext(context);
+			component.setContext(path, context);
 		
 		sides.add(new SideComponent(side, component));
 	}
 	
 	public void setMain(DComponent component) {
+		if (this.main != null)
+			this.main.close();
+		
 		this.main = component;
-		main.setContext(context);
+		main.setContext(path, context);
 		setBounds(bounds);
-		context.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
+		context.repaint(bounds);
 	}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
-		main.setContext(context);
+		this.path = parent.getChild("sidelayout", styleClass);
+		
+		main.setContext(path, context);
 		for (SideComponent side : sides)
-			side.component.setContext(context);
+			side.component.setContext(path, context);
 	}
 	
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
@@ -63,7 +75,7 @@ public class DSideLayout extends BaseComponentGroup {
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
 		
 		int left = bounds.x;
@@ -86,7 +98,7 @@ public class DSideLayout extends BaseComponentGroup {
 						componentWidth = preferences.maximumWidth;
 					}
 					
-					side.component.setBounds(new DRectangle(componentX, componentY, componentWidth, componentHeight));
+					side.component.setBounds(new DIRectangle(componentX, componentY, componentWidth, componentHeight));
 					top += componentHeight;
 					break;
 				}
@@ -102,7 +114,7 @@ public class DSideLayout extends BaseComponentGroup {
 						componentWidth = preferences.maximumWidth;
 					}
 					
-					side.component.setBounds(new DRectangle(componentX, componentY, componentWidth, componentHeight));
+					side.component.setBounds(new DIRectangle(componentX, componentY, componentWidth, componentHeight));
 					break;
 				}
 				case LEFT: {
@@ -116,7 +128,7 @@ public class DSideLayout extends BaseComponentGroup {
 						componentHeight = preferences.maximumHeight;
 					}
 					
-					side.component.setBounds(new DRectangle(componentX, componentY, componentWidth, componentHeight));
+					side.component.setBounds(new DIRectangle(componentX, componentY, componentWidth, componentHeight));
 					left += componentWidth;
 					break;
 				}
@@ -132,13 +144,13 @@ public class DSideLayout extends BaseComponentGroup {
 						componentHeight = preferences.maximumHeight;
 					}
 					
-					side.component.setBounds(new DRectangle(componentX, componentY, componentWidth, componentHeight));
+					side.component.setBounds(new DIRectangle(componentX, componentY, componentWidth, componentHeight));
 					break;
 				}
 			}
 		}
 		
-		main.setBounds(new DRectangle(left, top, right - left, bottom - top));
+		main.setBounds(new DIRectangle(left, top, right - left, bottom - top));
 	}
 
 	@Override
@@ -208,6 +220,13 @@ public class DSideLayout extends BaseComponentGroup {
 		
 		return null;
 	}
+
+	@Override
+	public void close() {
+		main.close();
+		for (SideComponent side : sides)
+			side.close();
+	}
 	
 	public class SideComponent implements Closeable, LiveObject.Listener<DDimensionPreferences> {
 		public final Side side;

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

@@ -16,6 +16,10 @@ public final class DTransform2D {
 		return new DTransform2D(1, 0, 0, 1, x, y);
 	}
 	
+	public static DTransform2D scaleAndTranslate(float x, float y, float scale) {
+		return new DTransform2D(scale, 0, 0, scale, x, y);
+	}
+	
 	public static DTransform2D scale(float scale) {
 		return new DTransform2D(scale, 0, 0, scale, 0, 0);
 	}
@@ -35,4 +39,16 @@ public final class DTransform2D {
 		this.dx = dx;
 		this.dy = dy;
 	}
+	
+	public DTransform2D offset(float x, float y) {
+		return new DTransform2D(xx, xy, yx, yy, dx + x, dy + y);
+	}
+	
+	public float getX(float x, float y) {
+		return x * xx + y * xy + dx;
+	}
+	
+	public float getY(float x, float y) {
+		return x * yx + y * yy + dy;
+	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DDrawingContext.java → DrawableGui/src/main/java/org/openzen/drawablegui/DUIContext.java

@@ -5,15 +5,24 @@
  */
 package org.openzen.drawablegui;
 
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.style.DStyleSheets;
+
 /**
  *
  * @author Hoofdgebruiker
  */
-public interface DDrawingContext {
+public interface DUIContext {
+	DStyleSheets getStylesheets();
+	
 	float getScale();
 	
 	void repaint(int x, int y, int width, int height);
 	
+	default void repaint(DIRectangle rectangle) {
+		repaint(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+	}
+	
 	void setCursor(Cursor cursor);
 	
 	void focus(DComponent component);

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

@@ -5,15 +5,15 @@
  */
 package org.openzen.drawablegui.border;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.listeners.DIRectangle;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public interface DBorder {
-	public void paint(DCanvas canvas, DRectangle bounds);
+	public void paint(DCanvas canvas, DIRectangle bounds);
 	
 	public int getPaddingLeft();
 	

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

@@ -5,8 +5,9 @@
  */
 package org.openzen.drawablegui.border;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DUIContext;
 
 /**
  *
@@ -14,9 +15,9 @@ import org.openzen.drawablegui.DCanvas;
  */
 public class DEmptyBorder implements DBorder {
 	public static final DEmptyBorder INSTANCE = new DEmptyBorder();
-
+	
 	@Override
-	public void paint(DCanvas canvas, DRectangle bounds) {
+	public void paint(DCanvas canvas, DIRectangle bounds) {
 		
 	}
 

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

@@ -5,9 +5,10 @@
  */
 package org.openzen.drawablegui.border;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DUIContext;
 
 /**
  *
@@ -23,7 +24,7 @@ public class DLineBorder implements DBorder {
 	}
 
 	@Override
-	public void paint(DCanvas canvas, DRectangle bounds) {
+	public void paint(DCanvas canvas, DIRectangle bounds) {
 		canvas.strokePath(tracer -> {
 				tracer.moveTo(bounds.x, bounds.y);
 				tracer.lineTo(bounds.x + bounds.width - borderWidth, bounds.y);

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

@@ -0,0 +1,20 @@
+/*
+ * 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.dimension;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DDimension {
+	float eval(DUIContext context);
+	
+	default int evalInt(DUIContext context) {
+		return (int)(eval(context) + 0.5f);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/dimension/DDpDimension.java

@@ -0,0 +1,25 @@
+/*
+ * 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.dimension;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DDpDimension implements DDimension {
+	private final float value;
+	
+	public DDpDimension(float value) {
+		this.value = value;
+	}
+
+	@Override
+	public float eval(DUIContext context) {
+		return value * context.getScale();
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/dimension/DPxDimension.java

@@ -0,0 +1,25 @@
+/*
+ * 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.dimension;
+
+import org.openzen.drawablegui.DUIContext;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DPxDimension implements DDimension {
+	private final float pixels;
+	
+	public DPxDimension(float pixels) {
+		this.pixels = pixels;
+	}
+
+	@Override
+	public float eval(DUIContext context) {
+		return pixels;
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DRectangle.java → DrawableGui/src/main/java/org/openzen/drawablegui/listeners/DIRectangle.java

@@ -3,19 +3,19 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.drawablegui;
+package org.openzen.drawablegui.listeners;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public final class DRectangle {
+public class DIRectangle {
 	public final int x;
 	public final int y;
 	public final int width;
 	public final int height;
 	
-	public DRectangle(int x, int y, int width, int height) {
+	public DIRectangle(int x, int y, int width, int height) {
 		this.x = x;
 		this.y = y;
 		this.width = width;

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollBar.java

@@ -5,33 +5,36 @@
  */
 package org.openzen.drawablegui.scroll;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawingContext;
 import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.live.ImmutableLiveObject;
 import org.openzen.drawablegui.live.LiveInt;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class DScrollBar implements DComponent {
-	private final DScrollBarStyle style;
 	private final LiveObject<DDimensionPreferences> preferences;
 	
+	private final DStyleClass styleClass;
 	private final LiveInt targetHeight;
 	private final LiveInt offset;
 	
 	private final ListenerHandle<LiveInt.Listener> targetHeightListener;
 	private final ListenerHandle<LiveInt.Listener> offsetListener;
 	
-	private DDrawingContext context;
-	private DRectangle bounds;
+	private DUIContext context;
+	private DScrollBarStyle style;
+	private DIRectangle bounds;
 	
 	private int fromY = 0;
 	private int toY = 0;
@@ -40,19 +43,21 @@ public class DScrollBar implements DComponent {
 	private int dragStartOffset;
 	private int dragStartY;
 	
-	public DScrollBar(DScrollBarStyle style, LiveInt targetHeight, LiveInt offset) {
-		this.style = style;
+	public DScrollBar(DStyleClass styleClass, LiveInt targetHeight, LiveInt offset) {
+		this.styleClass = styleClass;
 		this.targetHeight = targetHeight;
 		this.offset = offset;
-		this.preferences = new ImmutableLiveObject<>(new DDimensionPreferences(style.width, 0));
+		this.preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
 		
 		targetHeightListener = targetHeight.addListener(new ScrollListener());
 		offsetListener = offset.addListener(new ScrollListener());
 	}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
+		this.style = new DScrollBarStyle(context.getStylesheets().get(context, parent.getChild("scrollbar", styleClass)));
+		preferences.setValue(new DDimensionPreferences(style.width, 0));
 	}
 
 	@Override
@@ -61,12 +66,12 @@ public class DScrollBar implements DComponent {
 	}
 
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
 		recalculate();
 	}
@@ -84,7 +89,7 @@ public class DScrollBar implements DComponent {
 		if (dragging)
 			color = style.scrollBarPressColor;
 		
-		canvas.fillRectangle(bounds.x, bounds.y + fromY, this.bounds.width, toY - fromY, color);
+		canvas.fillRectangle(bounds.x, fromY, this.bounds.width, toY - fromY, color);
 	}
 	
 	@Override
@@ -125,6 +130,11 @@ public class DScrollBar implements DComponent {
 	public void onMouseRelease(DMouseEvent e) {
 		setDragging(false);
 	}
+
+	@Override
+	public void close() {
+		// nothing to clean up
+	}
 	
 	private void checkHover(DMouseEvent e) {
 		setHovering(e.y >= fromY && e.y < toY);
@@ -147,11 +157,11 @@ public class DScrollBar implements DComponent {
 	}
 	
 	private void recalculate() {
-		if (targetHeight.getValue() == 0)
+		if (targetHeight.getValue() == 0 || bounds == null)
 			return;
 		
-		fromY = this.bounds.height * offset.getValue() / targetHeight.getValue();
-		toY = this.bounds.height * (offset.getValue() + this.bounds.height) / targetHeight.getValue();
+		fromY = bounds.y + this.bounds.height * offset.getValue() / targetHeight.getValue();
+		toY = bounds.y + this.bounds.height * (offset.getValue() + this.bounds.height) / targetHeight.getValue();
 	}
 	
 	private class ScrollListener implements LiveInt.Listener {

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollBarStyle.java

@@ -5,29 +5,27 @@
  */
 package org.openzen.drawablegui.scroll;
 
+import org.openzen.drawablegui.dimension.DDimension;
+import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
 /**
  *
  * @author Hoofdgebruiker
  */
 public class DScrollBarStyle {
-	public static final DScrollBarStyle DEFAULT = new DScrollBarStyle(0xFFF0F0F0, 0xFFCDCDCD, 0xFF888888, 0xFF666666, 20);
-	
 	public final int scrollBarBackgroundColor;
 	public final int scrollBarNormalColor;
 	public final int scrollBarHoverColor;
 	public final int scrollBarPressColor;
 	public final int width;
 	
-	public DScrollBarStyle(
-			int scrollBarBackgroundColor,
-			int scrollBarNormalColor,
-			int scrollBarHoverColor,
-			int scrollBarPressColor,
-			int width) {
-		this.scrollBarBackgroundColor = scrollBarBackgroundColor;
-		this.scrollBarNormalColor = scrollBarNormalColor;
-		this.scrollBarHoverColor = scrollBarHoverColor;
-		this.scrollBarPressColor = scrollBarPressColor;
-		this.width = width;
+	public DScrollBarStyle(DStyleDefinition style) {
+		this.scrollBarBackgroundColor = style.getColor("scrollbar.background.color", 0xFFF0F0F0);
+		this.scrollBarNormalColor = style.getColor("scrollbar.color.normal", 0xFFCDCDCD);
+		this.scrollBarHoverColor = style.getColor("scrollbar.color.hover", 0xFF888888);
+		this.scrollBarPressColor = style.getColor("scrollbar.color.press", 0xFF666666);
+		this.width = style.getDimension("width", new DDpDimension(12));
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollPane.java

@@ -5,33 +5,36 @@
  */
 package org.openzen.drawablegui.scroll;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DClipboard;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawingContext;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontMetrics;
-import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveInt;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveInt;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+import org.openzen.drawablegui.style.DStyleSheets;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class DScrollPane implements DComponent {
-	private final DScrollPaneStyle style;
+	private final DStyleClass styleClass;
 	private final DComponent contents;
 	private final DScrollBar scrollBar;
-	private DDrawingContext context;
-	private DRectangle bounds;
+	private DUIContext context;
+	private DIRectangle bounds;
 	
+	private DScrollPaneStyle style;
 	private final LiveInt contentsHeight;
 	private final LiveInt offsetX;
 	private final LiveInt offsetY;
@@ -42,15 +45,15 @@ public class DScrollPane implements DComponent {
 	
 	private DComponent hovering = null;
 	
-	public DScrollPane(DScrollPaneStyle style, DComponent contents) {
-		this.style = style;
+	public DScrollPane(DStyleClass styleClass, DComponent contents) {
+		this.styleClass = styleClass;
 		this.contents = contents;
 		
 		contentsHeight = new SimpleLiveInt();
 		offsetX = new SimpleLiveInt();
 		offsetY = new SimpleLiveInt();
 		
-		scrollBar = new DScrollBar(style.scrollBarStyle, contentsHeight, offsetY);
+		scrollBar = new DScrollBar(DStyleClass.EMPTY, contentsHeight, offsetY);
 		
 		contentsHeightListener = contentsHeight.addListener(new ScrollListener());
 		offsetXListener = offsetX.addListener(new ScrollListener());
@@ -60,16 +63,22 @@ public class DScrollPane implements DComponent {
 			if (bounds == null)
 				return;
 			
-			contents.setBounds(new DRectangle(0, 0, bounds.width, Math.max(bounds.height, newPreferences.preferredHeight)));
+			contents.setBounds(new DIRectangle(0, 0, bounds.width, Math.max(bounds.height, newPreferences.preferredHeight)));
 			contentsHeight.setValue(newPreferences.preferredHeight);
 		});
 	}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
-		contents.setContext(new TranslatedContext());
-		scrollBar.setContext(context);
+		
+		DStylePath path = parent.getChild("scrollpane", styleClass);
+		contents.setContext(path, new TranslatedContext());
+		scrollBar.setContext(path, context);
+		style = new DScrollPaneStyle(context.getStylesheets().get(context, path));
+		
+		if (bounds != null)
+			setBounds(bounds);
 	}
 
 	@Override
@@ -78,23 +87,27 @@ public class DScrollPane implements DComponent {
 	}
 
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		
+		if (this.context == null)
+			return;
+		
 		int height = Math.max(
 				bounds.height - style.border.getPaddingTop() - style.border.getPaddingBottom(),
 				contents.getDimensionPreferences().getValue().preferredHeight);
 		int scrollBarWidth = scrollBar.getDimensionPreferences().getValue().preferredWidth;
-		scrollBar.setBounds(new DRectangle(
+		scrollBar.setBounds(new DIRectangle(
 				bounds.x + bounds.width - scrollBarWidth - style.border.getPaddingRight(),
 				bounds.y + style.border.getPaddingTop(),
 				scrollBarWidth,
 				bounds.height - style.border.getPaddingTop() - style.border.getPaddingBottom()));
-		contents.setBounds(new DRectangle(0, 0, bounds.width - scrollBar.getBounds().width, height));
+		contents.setBounds(new DIRectangle(0, 0, bounds.width - scrollBar.getBounds().width, height));
 		contentsHeight.setValue(height);
 	}
 
@@ -178,6 +191,11 @@ public class DScrollPane implements DComponent {
 		
 		onMouseMove(e);
 	}
+
+	@Override
+	public void close() {
+		contents.close();
+	}
 	
 	private DMouseEvent forward(DComponent target, DMouseEvent e) {
 		return target == contents ? translateMouseEvent(e) : e;
@@ -203,7 +221,12 @@ public class DScrollPane implements DComponent {
 				e.clickCount);
 	}
 	
-	private class TranslatedContext implements DDrawingContext {
+	private class TranslatedContext implements DUIContext {
+		
+		@Override
+		public DStyleSheets getStylesheets(){
+			return context.getStylesheets();
+		}
 
 		@Override
 		public float getScale() {
@@ -275,7 +298,7 @@ public class DScrollPane implements DComponent {
 			if (value != offsetY.getValue())
 				offsetY.setValue(value);
 			if (context != null && bounds != null)
-				context.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
+				context.repaint(bounds);
 		}
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/scroll/DScrollPaneStyle.java

@@ -7,21 +7,17 @@ package org.openzen.drawablegui.scroll;
 
 import org.openzen.drawablegui.border.DBorder;
 import org.openzen.drawablegui.border.DLineBorder;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleDefinition;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class DScrollPaneStyle {
-	public static final DScrollPaneStyle DEFAULT = new DScrollPaneStyle(new DLineBorder(0xFF888888, 1), DScrollBarStyle.DEFAULT);
-	
 	public final DBorder border;
-	public final DScrollBarStyle scrollBarStyle;
 	
-	public DScrollPaneStyle(
-			DBorder border,
-			DScrollBarStyle scrollBarStyle) {
-		this.border = border;
-		this.scrollBarStyle = scrollBarStyle;
+	public DScrollPaneStyle(DStyleDefinition style) {
+		this.border = style.getBorder("border", context -> new DLineBorder(0xFF888888, 1));
 	}
 }

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

@@ -0,0 +1,49 @@
+/*
+ * 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;
+import org.openzen.drawablegui.dimension.DDimension;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DEmptyStyleDefinition implements DStyleDefinition {
+	private final DUIContext context;
+	
+	public DEmptyStyleDefinition(DUIContext context) {
+		this.context = context;
+	}
+
+	@Override
+	public int getDimension(String name, DDimension defaultValue) {
+		return defaultValue.evalInt(context);
+	}
+	
+	@Override
+	public float getFloatDimension(String name, DDimension defaultValue) {
+		return defaultValue.eval(context);
+	}
+
+	@Override
+	public int getColor(String name, int defaultValue) {
+		return defaultValue;
+	}
+
+	@Override
+	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue) {
+		return defaultValue.apply(context);
+	}
+
+	@Override
+	public DBorder getBorder(String name, Function<DUIContext, DBorder> defaultValue) {
+		return defaultValue.apply(context);
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DEmptyStylesheets.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 class DEmptyStylesheets implements DStyleSheets {
+	public static final DEmptyStylesheets INSTANCE = new DEmptyStylesheets();
+
+	@Override
+	public DStyleDefinition get(DUIContext context, DStylePath path) {
+		return new DEmptyStyleDefinition(context);
+	}
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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 DStyleClass {
+	private static final String[] NO_CLASSES = new String[0];
+	public static final DStyleClass EMPTY = new DStyleClass(null, NO_CLASSES);
+	
+	public static DStyleClass forId(String id) {
+		return new DStyleClass(id, NO_CLASSES);
+	}
+	
+	public final String id;
+	public final String[] classes;
+	
+	public DStyleClass(String id, String[] classes) {
+		this.id = id;
+		this.classes = classes;
+	}
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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;
+import org.openzen.drawablegui.dimension.DDimension;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public interface DStyleDefinition {
+	public int getDimension(String name, DDimension defaultValue);
+	
+	public float getFloatDimension(String name, DDimension defaultValue);
+	
+	public int getColor(String name, int defaultValue);
+	
+	public DFont getFont(String name, Function<DUIContext, DFont> defaultValue);
+	
+	public DBorder getBorder(String name, Function<DUIContext, DBorder> defaultValue);
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/IDEStyle.java → DrawableGui/src/main/java/org/openzen/drawablegui/style/DStylePath.java

@@ -3,16 +3,12 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.openzen.zenscript.ide.ui;
+package org.openzen.drawablegui.style;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class IDEStyle {
-	public final int primaryColor;
-	
-	public IDEStyle(int primaryColor) {
-		this.primaryColor = primaryColor;
-	}
+public interface DStylePath {
+	public DStylePath getChild(String element, DStyleClass styleClass);
 }

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

@@ -0,0 +1,38 @@
+/*
+ * 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 DStylePathRoot implements DStylePath {
+	public static final DStylePathRoot INSTANCE = new DStylePathRoot();
+	
+	private DStylePathRoot() {}
+
+	@Override
+	public DStylePath getChild(String element, DStyleClass styleClass) {
+		return new DStyleChildElement(this, element, styleClass);
+	}
+	
+	private static class DStyleChildElement implements DStylePath {
+		private final DStylePath parent;
+		private final String element;
+		private final DStyleClass styleClass;
+		
+		public DStyleChildElement(DStylePath parent, String element, DStyleClass styleClass) {
+			this.parent = parent;
+			this.element = element;
+			this.styleClass = styleClass;
+		}
+
+		@Override
+		public DStylePath getChild(String element, DStyleClass styleClass) {
+			return new DStyleChildElement(this, element, styleClass);
+		}
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/style/DStyleSheets.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 DStyleSheets {
+	public DStyleDefinition get(DUIContext context, DStylePath path);
+}

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

@@ -13,15 +13,18 @@ import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
-import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.ConvolveOp;
+import java.awt.image.Kernel;
 import java.util.Stack;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DDrawingContext;
-import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DPathBoundsCalculator;
+import org.openzen.drawablegui.DUIContext;
 
 /**
  *
@@ -82,15 +85,7 @@ public class SwingCanvas implements DCanvas {
 	}
 
 	@Override
-	public float measureTextLength(DFont font, String text, int offset, int length) {
-		prepare(font);
-		g.setFont((Font) font.cached);
-		Rectangle2D rect = g.getFontMetrics().getStringBounds(text, offset, length, g);
-		return (float) rect.getWidth();
-	}
-
-	@Override
-	public DDrawingContext getContext() {
+	public DUIContext getContext() {
 		return context;
 	}
 
@@ -117,7 +112,22 @@ public class SwingCanvas implements DCanvas {
 
 	@Override
 	public void shadowPath(DPath path, DTransform2D transform, int color, float dx, float dy, float radius) {
-		// TODO
+		DIRectangle bounds = DPathBoundsCalculator.getBounds(path, transform.offset(dx, dy));
+		int offset = 2 * (int)Math.ceil(radius);
+		
+		GeneralPath jPath = context.getPath(path);
+		
+		BufferedImage image = new BufferedImage(bounds.width + 2 * offset, bounds.height + 2 * offset, BufferedImage.TYPE_INT_ARGB);
+		Graphics2D imageG = (Graphics2D) image.getGraphics();
+		
+		imageG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		imageG.setColor(new Color(color, true));
+		imageG.setTransform(getTransform(transform.offset(offset + dx - bounds.x, offset + dy - bounds.y)));
+		imageG.fill(jPath);
+		
+		image = getGaussianBlurFilter((int)Math.ceil(radius), true).filter(image, null);
+		image = getGaussianBlurFilter((int)Math.ceil(radius), false).filter(image, null);
+		g.drawImage(image, bounds.x - offset, bounds.y - offset, null);
 	}
 
 	@Override
@@ -143,4 +153,39 @@ public class SwingCanvas implements DCanvas {
 	private AffineTransform getTransform(DTransform2D transform) {
 		return new AffineTransform(transform.xx, transform.xy, transform.yx, transform.yy, transform.dx, transform.dy);
 	}
+    
+	
+	// taken from http://www.java2s.com/Code/Java/Advanced-Graphics/GaussianBlurDemo.htm
+    public static ConvolveOp getGaussianBlurFilter(int radius, boolean horizontal) {
+        if (radius < 1) {
+            throw new IllegalArgumentException("Radius must be >= 1");
+        }
+        
+        int size = radius * 2 + 1;
+        float[] data = new float[size];
+        
+        float sigma = radius / 3.0f;
+        float twoSigmaSquare = 2.0f * sigma * sigma;
+        float sigmaRoot = (float) Math.sqrt(twoSigmaSquare * Math.PI);
+        float total = 0.0f;
+        
+        for (int i = -radius; i <= radius; i++) {
+            float distance = i * i;
+            int index = i + radius;
+            data[index] = (float) Math.exp(-distance / twoSigmaSquare) / sigmaRoot;
+            total += data[index];
+        }
+        
+        for (int i = 0; i < data.length; i++) {
+            data[i] /= total;
+        }        
+        
+        Kernel kernel = null;
+        if (horizontal) {
+            kernel = new Kernel(size, 1, data);
+        } else {
+            kernel = new Kernel(1, size, data);
+        }
+        return new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
+    }
 }

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

@@ -13,24 +13,27 @@ import javax.swing.Timer;
 import org.openzen.drawablegui.DClipboard;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DDrawingContext;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPathTracer;
 import org.openzen.drawablegui.DTimerHandle;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleSheets;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class SwingGraphicsContext implements DDrawingContext {
-	public final float scale;
+public class SwingGraphicsContext implements DUIContext {
+	private final DStyleSheets stylesheets;
+	private final float scale;
 	private final WeakHashMap<DPath, GeneralPath> preparedPaths = new WeakHashMap<>();
 	private final SwingRoot root;
 	private final JavaClipboard clipboard = new JavaClipboard();
 	private Graphics graphics;
 	
-	public SwingGraphicsContext(float scale, SwingRoot root) {
+	public SwingGraphicsContext(DStyleSheets stylesheets, float scale, SwingRoot root) {
+		this.stylesheets = stylesheets;
 		this.scale = scale;
 		this.root = root;
 	}
@@ -45,6 +48,11 @@ public class SwingGraphicsContext implements DDrawingContext {
 		return generalPath;
 	}
 	
+	@Override
+	public DStyleSheets getStylesheets() {
+		return stylesheets;
+	}
+	
 	@Override
 	public float getScale() {
 		return scale;

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

@@ -20,11 +20,12 @@ import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DKeyEvent;
 import static org.openzen.drawablegui.DKeyEvent.KeyCode.*;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.DRectangle;
+import org.openzen.drawablegui.style.DEmptyStylesheets;
+import org.openzen.drawablegui.style.DStylePathRoot;
 
 /**
  *
@@ -34,15 +35,18 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 	public final SwingGraphicsContext context;
 	public final DComponent component;
 	private DComponent focus = null;
+	private boolean firstPaint = true;
 
 	public SwingRoot(DComponent root) {
 		this.component = root;
 		setFocusable(true);
 		setFocusTraversalKeysEnabled(false); // prevent tab from being handled by focus traversal
 		
-		context = new SwingGraphicsContext(Toolkit.getDefaultToolkit().getScreenResolution() / 96.0f, this);
-		component.setContext(context);
-		component.setBounds(new DRectangle(0, 0, getWidth(), getHeight()));
+		context = new SwingGraphicsContext(
+				DEmptyStylesheets.INSTANCE,
+				Toolkit.getDefaultToolkit().getScreenResolution() / 96.0f,
+				this);
+		component.setBounds(new DIRectangle(0, 0, getWidth(), getHeight()));
 		addComponentListener(this);
 		addMouseListener(this);
 		addMouseMotionListener(this);
@@ -63,6 +67,11 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 
 	@Override
 	public void paint(Graphics g) {
+		if (firstPaint) {
+			firstPaint = false;
+			component.setContext(DStylePathRoot.INSTANCE, context);
+		}
+		
 		Rectangle clipBounds = g.getClipBounds();
 		DIRectangle clipBounds2 = clipBounds == null ? null : new DIRectangle(clipBounds.x, clipBounds.y, clipBounds.width, clipBounds.height);
 		SwingCanvas canvas = new SwingCanvas((Graphics2D) g, context, clipBounds2);
@@ -71,7 +80,7 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 
 	@Override
 	public void componentResized(ComponentEvent e) {
-		component.setBounds(new DRectangle(0, 0,
+		component.setBounds(new DIRectangle(0, 0,
 				e.getComponent().getWidth(),
 				e.getComponent().getHeight()));
 

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

@@ -8,7 +8,7 @@ package org.openzen.drawablegui.swing;
 import java.awt.BorderLayout;
 import javax.swing.JFrame;
 import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DDrawingContext;
+import org.openzen.drawablegui.DUIContext;
 
 /**
  *
@@ -24,7 +24,7 @@ public final class SwingWindow extends JFrame {
 		swingComponent.requestFocusInWindow();
 	}
 	
-	public DDrawingContext getContext() {
+	public DUIContext getContext() {
 		return swingComponent.context;
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeView.java

@@ -8,18 +8,20 @@ package org.openzen.drawablegui.tree;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DDrawable;
-import org.openzen.drawablegui.DDrawingContext;
+import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
@@ -27,28 +29,32 @@ import org.openzen.drawablegui.live.SimpleLiveObject;
  */
 public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 	private final LiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
-	private DRectangle bounds;
+	private DIRectangle bounds;
 	
 	private int selectedRow = -1;
 	private N selectedNode = null;
 	
-	private final DTreeViewStyle style;
+	private final DTreeViewStyle styleDefinition;
+	private DTreeViewStyle.Calculated style;
+	private DFontMetrics fontMetrics;
 	
-	private DDrawingContext context;
+	private DUIContext context;
 	private final N root;
 	private final boolean showRoot;
 	private final List<Row> rows = new ArrayList<>();
 	
 	public DTreeView(DTreeViewStyle style, N root, boolean showRoot) {
-		this.style = style;
-		
+		this.styleDefinition = style;
 		this.root = root;
 		this.showRoot = showRoot;
 	}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
+		style = styleDefinition.forContext(context);
+		fontMetrics = context.getFontMetrics(style.font);
+		
 		updateLayout();
 	}
 
@@ -58,18 +64,18 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 	}
 	
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
 	}
 
 	@Override
 	public void paint(DCanvas canvas) {
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, styleDefinition.backgroundColor);
 		
 		int drawX = bounds.x + style.padding;
 		int drawY = bounds.y + style.padding;
@@ -88,7 +94,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		int row = yToRow(e.y);
 		if (row >= 0 && row < rows.size()) {
 			Row rowEntry = rows.get(row);
-			if (e.x >= rowEntry.x && e.x < (rowEntry.x + style.nodeOpenedIcon.getNominalWidth())) {
+			if (e.x >= rowEntry.x && e.x < (rowEntry.x + styleDefinition.nodeOpenedIcon.getNominalWidth())) {
 				if (!rowEntry.node.isLeaf())
 					rowEntry.node.isCollapsed().toggle();
 				return;
@@ -106,43 +112,48 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 							bounds.x,
 							rowToY(oldRow) - style.selectedPaddingTop,
 							bounds.width,
-							style.font.size + style.selectedPaddingTop + style.selectedPaddingBottom);
+							fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom);
 				context.repaint(
 						bounds.x,
 						rowToY(row) - style.selectedPaddingTop,
 						bounds.width,
-						style.font.size + style.selectedPaddingTop + style.selectedPaddingBottom);
+						fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom);
 			}
 		}
 	}
 	
 	private int rowToY(int row) {
-		return row * (style.rowSpacing + style.font.size) + style.padding;
+		return row * (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent()) + style.padding;
 	}
 	
 	private int yToRow(int y) {
-		return (y - bounds.y - style.padding) / (style.rowSpacing + style.font.size);
+		return (y - bounds.y - style.padding) / (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent());
 	}
 	
 	private int paintNode(DCanvas canvas, N node, int drawX, int drawY) {
-		int textColor = style.nodeTextColor;
+		int textColor = styleDefinition.nodeTextColor;
 		if (node == selectedNode) {
-			textColor = style.selectedNodeTextColor;
-			canvas.fillRectangle(bounds.x, drawY - style.selectedPaddingTop, bounds.width, style.font.size + style.selectedPaddingTop + style.selectedPaddingBottom, style.selectedBackgroundColor);
+			textColor = styleDefinition.selectedNodeTextColor;
+			canvas.fillRectangle(
+					bounds.x,
+					drawY - style.selectedPaddingTop,
+					bounds.width,
+					fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom,
+					styleDefinition.selectedBackgroundColor);
 		}
 		
 		int drawingX = drawX;
 		if (!node.isLeaf()) {
 			DDrawable icon = node.isCollapsed().getValue() ? style.nodeClosedIcon : style.nodeOpenedIcon;
-			icon.draw(canvas, DTransform2D.translate(drawingX, drawY + style.font.size - icon.getNominalHeight()));
+			icon.draw(canvas, DTransform2D.translate(drawingX, drawY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()));
 			drawingX += style.iconTextSpacing + icon.getNominalWidth();
 		} else {
 			drawingX += style.iconTextSpacing + style.nodeClosedIcon.getNominalWidth();
 		}
-		node.getIcon().draw(canvas, DTransform2D.translate(drawingX, drawY + style.font.size - node.getIcon().getNominalHeight()), textColor);
+		node.getIcon().draw(canvas, DTransform2D.translate(drawingX, drawY + fontMetrics.getAscent() + fontMetrics.getDescent() - node.getIcon().getNominalHeight()), textColor);
 		drawingX += style.iconTextSpacing + node.getIcon().getNominalWidth();
-		canvas.drawText(style.font, textColor, drawingX, drawY + style.font.size + style.textShift, node.getTitle());
-		drawY += style.font.size;
+		canvas.drawText(style.font, textColor, drawingX, drawY + fontMetrics.getAscent(), node.getTitle());
+		drawY += fontMetrics.getAscent() + fontMetrics.getDescent();
 		
 		if (!node.isCollapsed().getValue()) {
 			for (N child : node.getChildren()) {
@@ -195,6 +206,11 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			}
 		}
 	}
+
+	@Override
+	public void close() {
+		// nothing to clean up
+	}
 	
 	private class Row implements Closeable, LiveBool.Listener {
 		private final int x;
@@ -210,7 +226,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		@Override
 		public void onChanged(boolean oldValue, boolean newValue) {
 			updateLayout();
-			context.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
+			context.repaint(bounds);
 		}
 		
 		@Override

DrawableGui/src/main/java/org/openzen/drawablegui/tree/DTreeViewStyle.java

@@ -8,6 +8,9 @@ package org.openzen.drawablegui.tree;
 import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
+import org.openzen.drawablegui.dimension.DDimension;
+import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.DUIContext;
 
 /**
  *
@@ -20,33 +23,69 @@ public class DTreeViewStyle {
 	public final DDrawable nodeClosedIcon;
 	public final int backgroundColor;
 	public final int borderColor;
-	public final int padding;
-	public final int rowSpacing;
-	public final DFont font;
-	public final int indent;
-	public final int textShift;
-	public final int iconTextSpacing;
+	public final DDimension padding;
+	public final DDimension rowSpacing;
+	public final DDimension fontSize;
+	public final DDimension indent;
+	public final DDimension iconTextSpacing;
 	public final int nodeTextColor;
 	public final int selectedNodeTextColor;
 	public final int selectedBackgroundColor;
-	public final int selectedPaddingTop;
-	public final int selectedPaddingBottom;
+	public final DDimension selectedPaddingTop;
+	public final DDimension selectedPaddingBottom;
 	
 	private DTreeViewStyle() {
 		nodeOpenedIcon = ExpandedArrow.INSTANCE;
 		nodeClosedIcon = CollapsedArrow.INSTANCE;
 		backgroundColor = 0xFFFFFFFF;
 		borderColor = 0xFF888888;
-		padding = 5;
-		rowSpacing = 10;
-		font = new DFont(DFontFamily.UI, false, false, false, 22);
-		indent = 20;
-		textShift = -4;
-		iconTextSpacing = 3;
+		padding = new DDpDimension(3);
+		rowSpacing = new DDpDimension(2);
+		fontSize = new DDpDimension(12.5f);  
+		indent = new DDpDimension(12);
+		iconTextSpacing = new DDpDimension(2);
 		nodeTextColor = 0xFF000000;
 		selectedNodeTextColor = 0xFFFFFFFF;
 		selectedBackgroundColor = 0xFF007ACC;
-		selectedPaddingTop = 3;
-		selectedPaddingBottom = 3;
+		selectedPaddingTop = new DDpDimension(1);
+		selectedPaddingBottom = new DDpDimension(1);
+	}
+	
+	public Calculated forContext(DUIContext context) {
+		return new Calculated(this, context);
+	}
+	
+	public static class Calculated {
+		public final DDrawable nodeOpenedIcon;
+		public final DDrawable nodeClosedIcon;
+		public final int backgroundColor;
+		public final int borderColor;
+		public final int padding;
+		public final int rowSpacing;
+		public final DFont font;
+		public final int indent;
+		public final int iconTextSpacing;
+		public final int nodeTextColor;
+		public final int selectedNodeTextColor;
+		public final int selectedBackgroundColor;
+		public final int selectedPaddingTop;
+		public final int selectedPaddingBottom;
+		
+		private Calculated(DTreeViewStyle style, DUIContext context) {
+			nodeOpenedIcon = style.nodeOpenedIcon;
+			nodeClosedIcon = style.nodeClosedIcon;
+			backgroundColor = style.backgroundColor;
+			borderColor = style.borderColor;
+			padding = style.padding.evalInt(context);
+			rowSpacing = style.rowSpacing.evalInt(context);
+			font = new DFont(DFontFamily.UI, false, false, false, style.fontSize.evalInt(context));
+			indent = style.indent.evalInt(context);
+			iconTextSpacing = style.iconTextSpacing.evalInt(context);
+			nodeTextColor = style.nodeTextColor;
+			selectedNodeTextColor = style.selectedNodeTextColor;
+			selectedBackgroundColor = style.selectedBackgroundColor;
+			selectedPaddingTop = style.selectedPaddingTop.evalInt(context);
+			selectedPaddingBottom = style.selectedPaddingBottom.evalInt(context);
+		}
 	}
 }

DrawableGuiIconConverter/src/main/java/org/openzen/drawablegui/iconconverter/Main.java

@@ -21,9 +21,9 @@ import org.w3c.dom.NodeList;
  */
 public class Main {
 	public static void main(String[] args) throws Exception {
-		String filename = "baseline-folder-24px.svg"; //args[0];
+		String filename = "baseline-settings-20px.svg"; //args[0];
 		//String filename = "baseline-dashboard-24px.svg";
-		String className = "ColorableFolderIcon";
+		String className = "ColorableSettingsIcon";
 		File file = new File(filename);
 		if (!file.exists()) {
 			System.out.println("No such file: " + filename);
@@ -94,6 +94,8 @@ public class Main {
 		CharStream stream = new CharStream(path);
 		float x = 0;
 		float y = 0;
+		float guideX = 0;
+		float guideY = 0;
 		char instruction = stream.next();
 		while (stream.hasMore()) {
 			if (!stream.nextIsNumber())
@@ -187,6 +189,8 @@ public class Main {
 							.append(y3).append("f);\n");
 					x = x3;
 					y = y3;
+					guideX = x2;
+					guideY = y2;
 					break;
 				}
 				case 'c': {
@@ -198,6 +202,50 @@ public class Main {
 					float y3 = y + stream.parseFloat();
 					x = x3;
 					y = y3;
+					guideX = x2;
+					guideY = y2;
+					output.append(indent)
+							.append("tracer.bezierCubic(")
+							.append(x1).append("f, ")
+							.append(y1).append("f, ")
+							.append(x2).append("f, ")
+							.append(y2).append("f, ")
+							.append(x3).append("f, ")
+							.append(y3).append("f);\n");
+					break;
+				}
+				case 'S': {
+					float x1 = x + (x - guideX);
+					float y1 = y + (y - guideY);
+					float x2 = stream.parseFloat();
+					float y2 = stream.parseFloat();
+					float x3 = stream.parseFloat();
+					float y3 = stream.parseFloat();
+					output.append(indent)
+							.append("tracer.bezierCubic(")
+							.append(x1).append("f, ")
+							.append(y1).append("f, ")
+							.append(x2).append("f, ")
+							.append(y2).append("f, ")
+							.append(x3).append("f, ")
+							.append(y3).append("f);\n");
+					x = x3;
+					y = y3;
+					guideX = x2;
+					guideY = y2;
+					break;
+				}
+				case 's': {
+					float x1 = x + (x - guideX);
+					float y1 = y + (y - guideY);
+					float x2 = x + stream.parseFloat();
+					float y2 = y + stream.parseFloat();
+					float x3 = x + stream.parseFloat();
+					float y3 = y + stream.parseFloat();
+					x = x3;
+					y = y3;
+					guideX = x2;
+					guideY = y2;
 					output.append(indent)
 							.append("tracer.bezierCubic(")
 							.append(x1).append("f, ")

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

@@ -5,17 +5,18 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.Closeable;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.listeners.ListenerList;
+import org.openzen.drawablegui.live.LiveArrayList;
+import org.openzen.drawablegui.live.LiveList;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class IDEAspectBar {
-	private final List<IDEAspectToolbar> aspectToolbars = new ArrayList<>();
+	public final LiveList<IDEAspectToolbar> aspectToolbars = new LiveArrayList<>(); // TODO: only expose read-only variant
 	private final ListenerList<Listener> listeners = new ListenerList<>();
 	
 	public ListenerHandle<Listener> addListener(Listener listener) {
@@ -37,6 +38,11 @@ public class IDEAspectBar {
 		return true;
 	}
 	
+	public BarHandle openContentBar(IDEAspectToolbar toolbar) {
+		listeners.accept(listener -> listener.onOpenContextBar(toolbar));
+		return new BarHandle(toolbar);
+	}
+	
 	private int insertToolbar(IDEAspectToolbar toolbar) {
 		for (int i = 0; i < aspectToolbars.size(); i++) {
 			if (toolbar.order < aspectToolbars.get(i).order) {
@@ -49,8 +55,23 @@ public class IDEAspectBar {
 		return index;
 	}
 	
+	public class BarHandle implements Closeable {
+		private final IDEAspectToolbar toolbar;
+		
+		public BarHandle(IDEAspectToolbar toolbar) {
+			this.toolbar = toolbar;
+		}
+		
+		@Override
+		public void close() {
+			listeners.accept(listener -> listener.onCloseContextBar(toolbar));
+		}
+	}
+	
 	public interface Listener {
 		void onAspectBarAdded(int index, IDEAspectToolbar toolbar);
 		void onAspectBarRemoved(int index, IDEAspectToolbar toolbar);
+		void onOpenContextBar(IDEAspectToolbar toolbar);
+		void onCloseContextBar(IDEAspectToolbar toolbar);
 	}
 }

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

@@ -5,20 +5,12 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.DComponent;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public interface IDEAspectBarControl extends IDEDrawable {
-	ListenerHandle<InvalidationListener> addInvalidationListener(InvalidationListener listener);
-	
-	public interface InvalidationListener {
-		/* Indicates that this component needs to be redrawn */
-		void invalidateView(int x, int y, int width, int height);
-		
-		/* Indicates that layout should be recalculated for this component (eg because its size changed). */
-		void invalidateLayout();
-	}
+public interface IDEAspectBarControl {
+	DComponent instantiate();
 }

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

@@ -6,66 +6,24 @@
 package org.openzen.zenscript.ide.ui;
 
 import org.openzen.drawablegui.DColorableIcon;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.openzen.drawablegui.listeners.ListenerHandle;
-import org.openzen.drawablegui.listeners.ListenerList;
+import org.openzen.drawablegui.live.LiveArrayList;
+import org.openzen.drawablegui.live.LiveList;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class IDEAspectToolbar {
-	private final ListenerList<Listener> listeners = new ListenerList<>();
-	
 	public final int order;
 	public final DColorableIcon icon;
 	public final String title;
 	public final String description;
-	private boolean active;
-	private final List<IDEAspectBarControl> controls = new ArrayList<>();
+	public final LiveList<IDEAspectBarControl> controls = new LiveArrayList<>();
 	
 	public IDEAspectToolbar(int order, DColorableIcon icon, String title, String description) {
 		this.order = order;
 		this.icon = icon;
 		this.title = title;
 		this.description = description;
-		this.active = true;
-	}
-	
-	public ListenerHandle<Listener> addListener(Listener listener) {
-		return listeners.add(listener);
-	}
-	
-	public boolean getActive() {
-		return active;
-	}
-	
-	public void setActive(boolean active) {
-		this.active = active;
-		listeners.accept(listener -> listener.onActiveChanged(active));
-	}
-	
-	public List<IDEAspectBarControl> getControls() {
-		return Collections.unmodifiableList(controls);
-	}
-	
-	public void addControl(IDEAspectBarControl control) {
-		controls.add(control);
-		listeners.accept(listener -> listener.onControlAdded(control));
-	}
-	
-	public void removeControl(IDEAspectBarControl control) {
-		controls.remove(control);
-		listeners.accept(listener -> listener.onControlRemoved(control));
-	}
-	
-	public interface Listener {
-		void onActiveChanged(boolean active);
-		
-		void onControlAdded(IDEAspectBarControl control);
-		
-		void onControlRemoved(IDEAspectBarControl control);
 	}
 }

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

@@ -1,21 +0,0 @@
-/*
- * 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.zenscript.ide.ui;
-
-import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.DTransform2D;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface IDEDrawable {
-	void draw(DCanvas canvas, DTransform2D transform, IDEStyle style);
-	
-	float getNominalWidth();
-	
-	float getNominalHeight();
-}

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

@@ -6,6 +6,10 @@
 package org.openzen.zenscript.ide.ui;
 
 import org.openzen.zenscript.ide.host.IDESourceFile;
+import org.openzen.zenscript.ide.ui.icons.ColorableAddBoxIcon;
+import org.openzen.zenscript.ide.ui.icons.ColorableProjectIcon;
+import org.openzen.zenscript.ide.ui.icons.ColorableSettingsIcon;
+import org.openzen.zenscript.ide.ui.view.IconButtonControl;
 
 /**
  *
@@ -20,15 +24,24 @@ public class IDEWindow {
 		aspectBar = new IDEAspectBar();
 		dockWindow = new IDEDockWindow();
 		statusBar = new IDEStatusBar();
+		init();
 	}
 	
 	public IDEWindow(IDEAspectBar aspectBar, IDEDockWindow dockWindow, IDEStatusBar statusBar) {
 		this.aspectBar = aspectBar;
 		this.dockWindow = dockWindow;
 		this.statusBar = statusBar;
+		init();
 	}
 	
 	public void open(IDESourceFile sourceFile) {
 		dockWindow.currentSourceFile.setValue(sourceFile);
 	}
+	
+	private void init() {
+		IDEAspectToolbar projectToolbar = new IDEAspectToolbar(0, ColorableProjectIcon.INSTANCE, "Project", "Project management");
+		projectToolbar.controls.add(() -> new IconButtonControl(ColorableAddBoxIcon.BLACK, e -> {}));
+		projectToolbar.controls.add(() -> new IconButtonControl(ColorableSettingsIcon.BLACK, e -> {}));
+		aspectBar.addToolbar(projectToolbar);
+	}
 }

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColorableAddBoxIcon.java

@@ -0,0 +1,59 @@
+/*
+ * 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.zenscript.ide.ui.icons;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
+
+public class ColorableAddBoxIcon implements DColorableIcon {
+	public static final ColorableAddBoxIcon INSTANCE = new ColorableAddBoxIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	
+	private ColorableAddBoxIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(19f, 3f);
+		tracer.lineTo(5.0f, 3.0f);
+		tracer.bezierCubic(3.8899999f, 3.0f, 3.0f, 3.9f, 3.0f, 5.0f);
+		tracer.lineTo(3.0f, 19.0f);
+		tracer.bezierCubic(3.0f, 20.1f, 3.8899999f, 21.0f, 5.0f, 21.0f);
+		tracer.lineTo(19.0f, 21.0f);
+		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
+		tracer.lineTo(21.0f, 5.0f);
+		tracer.bezierCubic(21.0f, 3.9f, 20.1f, 3.0f, 19.0f, 3.0f);
+		tracer.close();
+		tracer.moveTo(17.0f, 13.0f);
+		tracer.lineTo(13.0f, 13.0f);
+		tracer.lineTo(13.0f, 17.0f);
+		tracer.lineTo(11.0f, 17.0f);
+		tracer.lineTo(11.0f, 13.0f);
+		tracer.lineTo(7.0f, 13.0f);
+		tracer.lineTo(7.0f, 11.0f);
+		tracer.lineTo(11.0f, 11.0f);
+		tracer.lineTo(11.0f, 7.0f);
+		tracer.lineTo(13.0f, 7.0f);
+		tracer.lineTo(13.0f, 11.0f);
+		tracer.lineTo(17.0f, 11.0f);
+		tracer.lineTo(17.0f, 13.0f);
+		tracer.close();
+	};
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return 24;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return 24;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColorableProjectIcon.java

@@ -8,11 +8,11 @@ package org.openzen.zenscript.ide.ui.icons;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.zenscript.ide.ui.IDEStyle;
 import org.openzen.drawablegui.DColorableIcon;
 
 public class ColorableProjectIcon implements DColorableIcon {
 	public static final ColorableProjectIcon INSTANCE = new ColorableProjectIcon();
+	public static final ColoredIcon GREY = new ColoredIcon(INSTANCE, 0xFF888888);
 	
 	private ColorableProjectIcon() {}
 	

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColorableSaveIcon.java

@@ -0,0 +1,57 @@
+/*
+ * 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.zenscript.ide.ui.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
+
+public class ColorableSaveIcon implements DColorableIcon {
+	public static final ColorableSaveIcon INSTANCE = new ColorableSaveIcon();
+	
+	private ColorableSaveIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(17f, 3f);
+		tracer.lineTo(5.0f, 3.0f);
+		tracer.bezierCubic(3.8899999f, 3.0f, 3.0f, 3.9f, 3.0f, 5.0f);
+		tracer.lineTo(3.0f, 19.0f);
+		tracer.bezierCubic(3.0f, 20.1f, 3.8899999f, 21.0f, 5.0f, 21.0f);
+		tracer.lineTo(19.0f, 21.0f);
+		tracer.bezierCubic(20.1f, 21.0f, 21.0f, 20.1f, 21.0f, 19.0f);
+		tracer.lineTo(21.0f, 7.0f);
+		tracer.lineTo(17.0f, 3.0f);
+		tracer.close();
+		tracer.moveTo(12.0f, 19.0f);
+		tracer.bezierCubic(10.34f, 19.0f, 9.0f, 17.66f, 9.0f, 16.0f);
+		tracer.bezierCubic(9.0f, 14.34f, 10.34f, 13.0f, 12.0f, 13.0f);
+		tracer.bezierCubic(13.66f, 13.0f, 15.0f, 14.34f, 15.0f, 16.0f);
+		tracer.bezierCubic(15.0f, 17.66f, 13.66f, 19.0f, 12.0f, 19.0f);
+		tracer.close();
+		tracer.moveTo(15.0f, 9.0f);
+		tracer.lineTo(5.0f, 9.0f);
+		tracer.lineTo(5.0f, 5.0f);
+		tracer.lineTo(15.0f, 5.0f);
+		tracer.lineTo(15.0f, 9.0f);
+		tracer.close();
+	};
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return 24;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return 24;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColorableSettingsIcon.java

@@ -0,0 +1,81 @@
+/*
+ * 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.zenscript.ide.ui.icons;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DColorableIcon;
+
+public class ColorableSettingsIcon implements DColorableIcon {
+	public static final ColorableSettingsIcon INSTANCE = new ColorableSettingsIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	
+	private ColorableSettingsIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(15.95f, 10.78f);
+		tracer.bezierCubic(15.98f, 10.53f, 16.0f, 10.2699995f, 16.0f, 10.0f);
+		tracer.bezierCubic(16.0f, 9.7300005f, 15.98f, 9.47f, 15.94f, 9.22f);
+		tracer.lineTo(17.63f, 7.9f);
+		tracer.bezierCubic(17.779999f, 7.78f, 17.82f, 7.56f, 17.73f, 7.3900003f);
+		tracer.lineTo(16.13f, 4.6200004f);
+		tracer.bezierCubic(16.029999f, 4.4400005f, 15.819999f, 4.3800006f, 15.639999f, 4.4400005f);
+		tracer.lineTo(13.65f, 5.2400007f);
+		tracer.bezierCubic(13.23f, 4.9200006f, 12.79f, 4.660001f, 12.299999f, 4.460001f);
+		tracer.lineTo(12f, 2.34f);
+		tracer.bezierCubic(11.97f, 2.1399999f, 11.8f, 1.9999999f, 11.6f, 1.9999999f);
+		tracer.lineTo(8.4f, 1.9999999f);
+		tracer.bezierCubic(8.2f, 1.9999999f, 8.04f, 2.1399999f, 8.009999f, 2.34f);
+		tracer.lineTo(7.709999f, 4.46f);
+		tracer.bezierCubic(7.2199993f, 4.66f, 6.769999f, 4.93f, 6.359999f, 5.24f);
+		tracer.lineTo(4.369999f, 4.4399996f);
+		tracer.bezierCubic(4.189999f, 4.3699994f, 3.979999f, 4.4399996f, 3.879999f, 4.6199994f);
+		tracer.lineTo(2.2799988f, 7.3899994f);
+		tracer.bezierCubic(2.1799989f, 7.569999f, 2.2199988f, 7.7799993f, 2.3799987f, 7.8999996f);
+		tracer.lineTo(4.0699987f, 9.219999f);
+		tracer.bezierCubic(4.029999f, 9.469999f, 3.9999988f, 9.74f, 3.9999988f, 9.999999f);
+		tracer.bezierCubic(3.9999988f, 10.259998f, 4.019999f, 10.529999f, 4.059999f, 10.779999f);
+		tracer.lineTo(2.37f, 12.1f);
+		tracer.bezierCubic(2.2199998f, 12.22f, 2.1799998f, 12.440001f, 2.27f, 12.610001f);
+		tracer.lineTo(3.87f, 15.380001f);
+		tracer.bezierCubic(3.9699998f, 15.560001f, 4.18f, 15.620001f, 4.3599997f, 15.560001f);
+		tracer.lineTo(6.3499994f, 14.760001f);
+		tracer.bezierCubic(6.7699995f, 15.080001f, 7.2099996f, 15.340001f, 7.6999993f, 15.540001f);
+		tracer.lineTo(7.9999995f, 17.66f);
+		tracer.bezierCubic(8.04f, 17.86f, 8.2f, 18.0f, 8.4f, 18.0f);
+		tracer.lineTo(11.599999f, 18.0f);
+		tracer.bezierCubic(11.799999f, 18.0f, 11.969999f, 17.86f, 11.99f, 17.66f);
+		tracer.lineTo(12.29f, 15.54f);
+		tracer.bezierCubic(12.78f, 15.34f, 13.23f, 15.07f, 13.64f, 14.76f);
+		tracer.lineTo(15.63f, 15.56f);
+		tracer.bezierCubic(15.81f, 15.63f, 16.02f, 15.56f, 16.12f, 15.38f);
+		tracer.lineTo(17.720001f, 12.610001f);
+		tracer.bezierCubic(17.820002f, 12.43f, 17.78f, 12.22f, 17.62f, 12.1f);
+		tracer.lineTo(15.950001f, 10.780001f);
+		tracer.close();
+		tracer.moveTo(10f, 13f);
+		tracer.bezierCubic(8.35f, 13.0f, 7.0f, 11.65f, 7.0f, 10.0f);
+		tracer.bezierCubic(7.0f, 8.35f, 8.35f, 7.0f, 10.0f, 7.0f);
+		tracer.bezierCubic(11.65f, 7.0f, 13.0f, 8.35f, 13.0f, 10.0f);
+		tracer.bezierCubic(13.0f, 11.65f, 11.65f, 13.0f, 10.0f, 13.0f);
+		tracer.close();
+	};
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.fillPath(PATH, transform, color);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return 20;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return 20;
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/ColoredIcon.java

@@ -0,0 +1,40 @@
+/*
+ * 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.zenscript.ide.ui.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DTransform2D;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class ColoredIcon implements DDrawable {
+	private final DColorableIcon icon;
+	private final int color;
+	
+	public ColoredIcon(DColorableIcon icon, int color) {
+		this.icon = icon;
+		this.color = color;
+	}
+
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform) {
+		icon.draw(canvas, transform, color);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return icon.getNominalWidth();
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return icon.getNominalHeight();
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/icons/SaveIcon.java

@@ -0,0 +1,31 @@
+/*
+ * 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.zenscript.ide.ui.icons;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DTransform2D;
+
+public class SaveIcon implements DDrawable {
+	public static final SaveIcon INSTANCE = new SaveIcon();
+	
+	private SaveIcon() {}
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform) {
+		ColorableSaveIcon.INSTANCE.draw(canvas, transform, 0xFF000000);
+	}
+
+	@Override
+	public float getNominalWidth() {
+		return 24;
+	}
+
+	@Override
+	public float getNominalHeight() {
+		return 24;
+	}
+}

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

@@ -0,0 +1,98 @@
+/*
+ * 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.zenscript.ide.ui.view;
+
+import java.util.function.Consumer;
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStylePath;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class IconButtonControl implements DComponent {
+	private final DDrawable icon;
+	private final Consumer<DMouseEvent> onClick;
+	
+	private DUIContext context;
+	private DIRectangle bounds;
+	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	private boolean hover;
+	
+	public IconButtonControl(DDrawable icon, Consumer<DMouseEvent> onClick) {
+		this.icon = icon;
+		this.onClick = onClick;
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		preferences.setValue(new DDimensionPreferences(
+				(int)(icon.getNominalWidth() * context.getScale() + 0.5f),
+				(int)(icon.getNominalHeight() * context.getScale() + 0.5f)));
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		if (hover) {
+			canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, 0xFFE0E0E0);
+		}
+		icon.draw(canvas, DTransform2D.scaleAndTranslate(
+				bounds.x + (bounds.width - icon.getNominalWidth() * context.getScale()) / 2,
+				bounds.y + (bounds.height - icon.getNominalHeight() * context.getScale()) / 2,
+				context.getScale()));
+	}
+
+	@Override
+	public void close() {
+		// nothing to clean up
+	}
+	
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		hover = true;
+		context.repaint(bounds);
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		hover = false;
+		context.repaint(bounds);
+	}
+	
+	@Override
+	public void onMouseClick(DMouseEvent e) {
+		onClick.accept(e);
+	}
+	
+	private void repaint() {
+		
+	}
+}

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

@@ -5,13 +5,14 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawingContext;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
@@ -22,11 +23,11 @@ public class StatusBarView implements DComponent {
 	//private static final int COLOR = 0xFFFFFFFF;
 	
 	private final SimpleLiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(new DDimensionPreferences(0, 40));
-	private DRectangle bounds;
-	private DDrawingContext context;
+	private DIRectangle bounds;
+	private DUIContext context;
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
 	}
 	
@@ -36,12 +37,12 @@ public class StatusBarView implements DComponent {
 	}
 	
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
 	}
 
@@ -49,4 +50,9 @@ public class StatusBarView implements DComponent {
 	public void paint(DCanvas canvas) {
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, COLOR);
 	}
+
+	@Override
+	public void close() {
+		// nothing to clean up
+	}
 }

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

@@ -8,12 +8,13 @@ package org.openzen.zenscript.ide.ui.view;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DEmptyView;
 import org.openzen.drawablegui.scroll.DScrollPane;
-import org.openzen.drawablegui.scroll.DScrollPaneStyle;
 import org.openzen.drawablegui.DSideLayout;
+import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.tree.DTreeView;
 import org.openzen.drawablegui.tree.DTreeViewStyle;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
 import org.openzen.zenscript.ide.ui.IDEWindow;
+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;
 
@@ -23,18 +24,19 @@ import org.openzen.zenscript.ide.ui.view.project.RootTreeNode;
  */
 public final class WindowView extends DSideLayout {
 	public WindowView(IDEWindow window, DevelopmentHost host) {
-		super(DEmptyView.INSTANCE);
+		super(DStyleClass.EMPTY, DEmptyView.INSTANCE);
 		
 		DTreeView projectView = new DTreeView(DTreeViewStyle.DEFAULT, new RootTreeNode(window, host), false);
 		projectView.getDimensionPreferences().setValue(new DDimensionPreferences(500, 500));
-		add(Side.LEFT, new DScrollPane(DScrollPaneStyle.DEFAULT, projectView));
+		add(Side.LEFT, new DScrollPane(DStyleClass.forId("projectView"), projectView));
 		add(Side.BOTTOM, new StatusBarView());
+		add(Side.TOP, new AspectBarView(DStyleClass.EMPTY, window.aspectBar));
 		
 		window.dockWindow.currentSourceFile.addListener((oldSource, newSource) -> {
 			if (newSource == null) {
 				setMain(DEmptyView.INSTANCE);
 			} else {
-				setMain(new DScrollPane(DScrollPaneStyle.DEFAULT, new SourceEditor(newSource)));
+				setMain(new DScrollPane(DStyleClass.EMPTY, new SourceEditor(DStyleClass.EMPTY, window, newSource)));
 			}
 		});
 	}

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

@@ -0,0 +1,95 @@
+/*
+ * 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.zenscript.ide.ui.view.aspectbar;
+
+import org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DDrawable;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AspectBarSelectorButton implements DComponent {
+	
+	public final LiveBool active = new LiveBool();
+	
+	private final DStyleClass styleClass;
+	private final DDrawable icon;
+	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	private DUIContext context;
+	private AspectBarSelectorButtonStyle style;
+	private DIRectangle bounds;
+	private DPath shape;
+	
+	public AspectBarSelectorButton(DStyleClass styleClass, DDrawable icon) {
+		this.styleClass = styleClass;
+		this.icon = icon;
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		DStylePath path = parent.getChild("selectorbutton", styleClass);
+		style = new AspectBarSelectorButtonStyle(context.getStylesheets().get(context, path));
+		shape = DPath.roundedRectangle(
+				0,
+				0,
+				style.width,
+				style.height,
+				style.roundingRadius);
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		canvas.shadowPath(
+					shape,
+					DTransform2D.translate(bounds.x, bounds.y),
+					style.shadowColor,
+					style.shadowOffsetX,
+					style.shadowOffsetY,
+					style.shadowRadius);
+			canvas.fillPath(
+					shape,
+					DTransform2D.translate(bounds.x, bounds.y),
+					style.colorNormal);
+			icon.draw(canvas, DTransform2D.scaleAndTranslate(
+					bounds.x + (style.width - icon.getNominalWidth() * context.getScale()) / 2,
+					bounds.y + (style.height - icon.getNominalHeight() * context.getScale()) / 2,
+					context.getScale()));
+	}
+
+	@Override
+	public void close() {
+		// nothing
+	}
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.zenscript.ide.ui.view.aspectbar;
+
+import org.openzen.drawablegui.dimension.DDimension;
+import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AspectBarSelectorButtonStyle {
+	public final int width;
+	public final int height;
+	public final int roundingRadius;
+	
+	public final int colorNormal;
+	public final int colorHover;
+	public final int colorPress;
+	public final int colorActive;
+	
+	public final int shadowColor;
+	public final float shadowOffsetX;
+	public final float shadowOffsetY;
+	public final float shadowRadius;
+	
+	public AspectBarSelectorButtonStyle(DStyleDefinition style) {
+		width = style.getDimension("width", new DDpDimension(24));
+		height = style.getDimension("height", new DDpDimension(24));
+		roundingRadius = style.getDimension("roundingRadius", new DDpDimension(4));
+		
+		colorNormal = style.getColor("colorNormal", 0xFFFFFFFF);
+		colorHover = style.getColor("colorHover", 0xFFCCCCCC);
+		colorPress = style.getColor("colorPress", 0xFFBBBBBB);
+		colorActive = style.getColor("colorActive", 0xFFBBBBBB);
+		
+		shadowRadius = style.getDimension("shadowRadius", new DDpDimension(3));
+		shadowColor = style.getColor("ashadowColor", 0xFF888888);
+		shadowOffsetX = style.getDimension("shadowOffsetX", new DDpDimension(0));
+		shadowOffsetY = style.getDimension("shadowOffsetY", new DDpDimension(0.5f));
+	}
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.zenscript.ide.ui.view.aspectbar;
+
+import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class AspectBarStyle {
+	public final int height;
+	public final int aspectSelectorPaddingLeft;
+	public final int aspectSelectorToToolbarSpacing;
+	public final int aspectSelectorBottomSize;
+	public final int backgroundColor;
+	public final int foregroundColor;
+	
+	public final int aspectSelectorButtonRadius;
+	public final int aspectSelectorButtonSpacing;
+	public final int aspectSelectorButtonShadowRadius;
+	public final int aspectSelectorButtonShadowColor;
+	public final float aspectSelectorButtonShadowOffsetX;
+	public final float aspectSelectorButtonShadowOffsetY;
+	
+	public final int aspectBarShadowRadius;
+	public final int aspectBarShadowColor;
+	public final float aspectBarShadowOffsetX;
+	public final float aspectBarShadowOffsetY;
+	public final int aspectBarPaddingTop;
+	
+	public final int controlPaddingTop;
+	public final int controlPaddingBottom;
+	
+	public AspectBarStyle(DStyleDefinition style) {
+		height = style.getDimension("height", new DDpDimension(32));
+		aspectSelectorPaddingLeft = style.getDimension("aspectSelectorPaddingLeft", new DDpDimension(4));
+		aspectSelectorToToolbarSpacing = style.getDimension("aspectSelectorToToolbarSpacing", new DDpDimension(16));
+		aspectSelectorBottomSize = style.getDimension("aspectSelectorBottomSize", new DDpDimension(4));
+		backgroundColor = style.getColor("backgroundColor", 0xFFF0F0F0);
+		foregroundColor = style.getColor("foregroundColor", 0xFFFFFFFF);
+		
+		aspectSelectorButtonRadius = style.getDimension("aspectSelectorButtonRadius", new DDpDimension(12));
+		aspectSelectorButtonSpacing = style.getDimension("aspectSelectorButtonSpacing", new DDpDimension(4));
+		aspectSelectorButtonShadowRadius = style.getDimension("aspectSelectorButtonShadowRadius", new DDpDimension(3));
+		aspectSelectorButtonShadowColor = style.getColor("aspectSelectorButtonShadowColor", 0xFF888888);
+		aspectSelectorButtonShadowOffsetX = style.getDimension("aspectSelectorButtonShadowOffsetX", new DDpDimension(0));
+		aspectSelectorButtonShadowOffsetY = style.getDimension("aspectSelectorButtonShadowOffsetY", new DDpDimension(0.5f));
+		
+		aspectBarShadowRadius = style.getDimension("aspectBarShadowRadius", new DDpDimension(2));
+		aspectBarShadowColor = style.getColor("aspectBarShadowColor", 0xFF888888);
+		aspectBarShadowOffsetX = style.getDimension("aspectBarShadowOffsetX", new DDpDimension(0));
+		aspectBarShadowOffsetY = style.getDimension("aspectBarShadowOffsetX", new DDpDimension(0.5f));
+		aspectBarPaddingTop = style.getDimension("aspectBarPaddingTop", new DDpDimension(2));
+		
+		controlPaddingTop = style.getDimension("controlPaddingTop", new DDpDimension(2));
+		controlPaddingBottom = style.getDimension("controlPaddingBottom", new DDpDimension(2));
+	}
+}

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

@@ -5,30 +5,70 @@
  */
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
-import org.openzen.zenscript.ide.ui.view.*;
-import org.openzen.drawablegui.DRectangle;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import org.openzen.drawablegui.BaseComponentGroup;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawingContext;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.zenscript.ide.ui.IDEAspectBar;
+import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.LiveMappedList;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+import org.openzen.zenscript.ide.ui.IDEAspectBarControl;
 
 /**
  *
  * @author Hoofdgebruiker
  */
-public class AspectBarView implements DComponent {
-	private static final int COLOR = 0xFFF0F0F0;
-	//private static final int COLOR = 0xFFFFFFFF;
+public class AspectBarView extends BaseComponentGroup {
+	private final SimpleLiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(new DDimensionPreferences(0, 64));
+	private final DStyleClass styleClass;
+	private final IDEAspectBar aspectBar;
+	private final List<IDEAspectToolbar> contextBars = new ArrayList<>();
+	
+	private DIRectangle bounds;
+	private DUIContext context;
+	private DStylePath path;
+	private AspectBarStyle style;
+	public final LiveObject<IDEAspectToolbar> active = new SimpleLiveObject<>(null);
+	private LiveMappedList<IDEAspectBarControl, DComponent> activeToolbarComponents;
+	
+	private final ListenerHandle<LiveList.Listener<IDEAspectToolbar>> listener;
+	private DPath aspectBarShape;
+	
+	public AspectBarView(DStyleClass styleClass, IDEAspectBar aspectBar) {
+		this.styleClass = styleClass;
+		this.aspectBar = aspectBar;
+		
+		active.addListener(this::onActiveChanged);
+		listener = aspectBar.aspectToolbars.addListener(new ToolbarListListener());
+		
+		if (aspectBar.aspectToolbars.size() > 0)
+			active.setValue(aspectBar.aspectToolbars.get(0));
+	}
 	
-	private final SimpleLiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(new DDimensionPreferences(0, 40));
-	private DRectangle bounds;
-	private DDrawingContext context;
-
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
+		this.path = parent.getChild("aspectbar", styleClass);
+		this.style = new AspectBarStyle(context.getStylesheets().get(context, path));
+		
+		if (bounds != null) {
+			calculateAspectBarShape();
+			active.setValue(active.getValue());
+		}
 	}
 	
 	@Override
@@ -37,17 +77,197 @@ public class AspectBarView implements DComponent {
 	}
 	
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
+		
+		if (context != null) {
+			calculateAspectBarShape();
+			context.repaint(bounds);
+		}
 	}
 
 	@Override
 	public void paint(DCanvas canvas) {
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, COLOR);
+		canvas.pushBounds(bounds);
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		
+		//DPath circle = DPath.circle(0, 0, style.aspectSelectorButtonRadius);
+		DPath circle = DPath.roundedRectangle(
+				-style.aspectSelectorButtonRadius,
+				-style.aspectSelectorButtonRadius,
+				2 * style.aspectSelectorButtonRadius,
+				2 * style.aspectSelectorButtonRadius,
+				8);
+		int x = bounds.x + style.aspectSelectorPaddingLeft;
+		int y = bounds.y;
+		for (IDEAspectToolbar toolbar : aspectBar.aspectToolbars) {
+			canvas.shadowPath(
+					circle,
+					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
+					style.aspectSelectorButtonShadowColor,
+					style.aspectSelectorButtonShadowOffsetX,
+					style.aspectSelectorButtonShadowOffsetY,
+					style.aspectSelectorButtonShadowRadius);
+			canvas.fillPath(
+					circle,
+					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
+					style.foregroundColor);
+			toolbar.icon.draw(canvas, DTransform2D.scaleAndTranslate(
+					x + (2 * style.aspectSelectorButtonRadius - toolbar.icon.getNominalWidth() * context.getScale()) / 2,
+					y + (style.height - toolbar.icon.getNominalHeight() * context.getScale()) / 2,
+					context.getScale()), 0xFF888888);
+			x += style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing;
+		}
+		for (IDEAspectToolbar toolbar : contextBars) {
+			canvas.shadowPath(
+					circle,
+					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
+					style.aspectSelectorButtonShadowColor,
+					style.aspectSelectorButtonShadowOffsetX,
+					style.aspectSelectorButtonShadowOffsetY,
+					style.aspectSelectorButtonShadowRadius);
+			canvas.fillPath(
+					circle,
+					DTransform2D.translate(x + style.aspectSelectorButtonRadius, y + style.height / 2),
+					style.foregroundColor);
+			toolbar.icon.draw(canvas, DTransform2D.scaleAndTranslate(
+					x + (2 * style.aspectSelectorButtonRadius - toolbar.icon.getNominalWidth() * context.getScale()) / 2,
+					y + (style.height - toolbar.icon.getNominalHeight() * context.getScale()) / 2,
+					context.getScale()), 0xFF000000);
+			x += style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing;
+		}
+		
+		
+		canvas.shadowPath(
+				aspectBarShape,
+				DTransform2D.IDENTITY,
+				style.aspectBarShadowColor,
+				style.aspectBarShadowOffsetX,
+				style.aspectBarShadowOffsetY,
+				style.aspectBarShadowRadius);
+		canvas.fillPath(
+				aspectBarShape,
+				DTransform2D.IDENTITY,
+				style.foregroundColor);
+		
+		if (activeToolbarComponents != null) {
+			for (DComponent component : activeToolbarComponents)
+				component.paint(canvas);
+		}
+		
+		canvas.popBounds();
+	}
+
+	@Override
+	public void close() {
+		listener.close();
+	}
+	
+	private void onActiveChanged(IDEAspectToolbar previous, IDEAspectToolbar aspectBar) {
+		if (activeToolbarComponents != null)
+			activeToolbarComponents.close();
+		
+		activeToolbarComponents = new LiveMappedList<>(aspectBar.controls, control -> {
+			DComponent result = control.instantiate();
+			if (context != null)
+				result.setContext(path, context);
+			return result;
+		});
+		
+		layoutActiveToolbarComponents();
+	}
+	
+	private void layoutActiveToolbarComponents() {
+		if (bounds == null)
+			return;
+		
+		int x = bounds.x
+				+ style.aspectSelectorPaddingLeft
+				+ (style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing) * (aspectBar.aspectToolbars.size() + contextBars.size())
+				+ style.aspectSelectorToToolbarSpacing;
+		
+		int y = style.aspectBarPaddingTop + style.controlPaddingTop;
+		int height = bounds.height - y - style.controlPaddingBottom;
+		for (DComponent toolbarComponent : activeToolbarComponents) {
+			int width = toolbarComponent.getDimensionPreferences().getValue().preferredWidth;
+			toolbarComponent.setBounds(
+					new DIRectangle(x, bounds.y + y, width, height));
+			x += width;
+		}
+		
+		context.repaint(bounds);
+	}
+
+	@Override
+	protected void forEachChild(Consumer<DComponent> children) {
+		if (activeToolbarComponents == null)
+			return;
+		
+		for (DComponent component : activeToolbarComponents)
+			children.accept(component);
+	}
+
+	@Override
+	protected DComponent findChild(Predicate<DComponent> predicate) {
+		if (activeToolbarComponents == null)
+			return null;
+		
+		for (DComponent component : activeToolbarComponents)
+			if (predicate.test(component))
+				return component;
+		
+		return null;
+	}
+	
+	private void calculateAspectBarShape() {
+		int toX = bounds.x
+				+ style.aspectSelectorPaddingLeft
+				+ (style.aspectSelectorButtonRadius * 2 + style.aspectSelectorButtonSpacing) * (aspectBar.aspectToolbars.size() + contextBars.size());
+		
+		aspectBarShape = tracer -> {
+			int baseY = bounds.y + bounds.height - style.aspectSelectorBottomSize;
+			tracer.moveTo(bounds.x, baseY);
+			tracer.lineTo(toX, baseY);
+			tracer.bezierCubic(
+					toX + 6 * context.getScale(), baseY,
+					toX + style.aspectSelectorToToolbarSpacing - 6 * context.getScale(), bounds.y + style.aspectBarPaddingTop,
+					toX + style.aspectSelectorToToolbarSpacing, bounds.y + style.aspectBarPaddingTop);
+			tracer.lineTo(bounds.x + bounds.width, bounds.y + style.aspectBarPaddingTop);
+			tracer.lineTo(bounds.x + bounds.width, bounds.y + bounds.height);
+			tracer.lineTo(bounds.x, bounds.y + bounds.height);
+			tracer.close();
+		};
+	}
+	
+	private class ToolbarListListener implements LiveList.Listener<IDEAspectToolbar> {
+
+		@Override
+		public void onInserted(int index, IDEAspectToolbar value) {
+			if (index == 0 && activeToolbarComponents == null)
+				active.setValue(value);
+			
+			layoutActiveToolbarComponents();
+			calculateAspectBarShape();
+		}
+
+		@Override
+		public void onChanged(int index, IDEAspectToolbar oldValue, IDEAspectToolbar newValue) {
+			if (oldValue == active.getValue())
+				active.setValue(newValue);
+		}
+
+		@Override
+		public void onRemoved(int index, IDEAspectToolbar oldValue) {
+			if (oldValue == active.getValue())
+				active.setValue(aspectBar.aspectToolbars.size() == 0 ? null : aspectBar.aspectToolbars.get(0));
+			
+			layoutActiveToolbarComponents();
+			calculateAspectBarShape();
+		}
 	}
 }

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

@@ -9,32 +9,37 @@ import java.io.IOException;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.DDrawingContext;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DFontMetrics;
-import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.DKeyEvent;
-import org.openzen.drawablegui.DKeyEvent.KeyCode;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.DRectangle;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.zenscript.ide.host.IDESourceFile;
+import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
+import org.openzen.zenscript.ide.ui.IDEWindow;
+import org.openzen.zenscript.ide.ui.icons.ColorableCodeIcon;
 import org.openzen.zenscript.lexer.ReaderCharReader;
 import org.openzen.zenscript.lexer.TokenParser;
 import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+import org.openzen.zenscript.ide.ui.icons.SaveIcon;
+import org.openzen.zenscript.ide.ui.view.IconButtonControl;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class SourceEditor implements DComponent {
-	private final SourceEditorStyle style = SourceEditorStyle.DEFAULT;
+	private final DStyleClass styleClass;
 	private final DFont font = new DFont(DFontFamily.CODE, false, false, false, 24);
 	private final LiveObject<DDimensionPreferences> dimensionPreferences = new SimpleLiveObject<>(new DDimensionPreferences(0, 0));
 	private final String tab = "    ";
@@ -42,8 +47,10 @@ public class SourceEditor implements DComponent {
 	private final TokenModel tokens;
 	private final ListenerHandle<TokenModel.Listener> tokenListener;
 	
-	private DRectangle bounds;
-	private DDrawingContext context;
+	private DIRectangle bounds;
+	private DUIContext context;
+	private SourceEditorStyle style;
+	
 	private DFontMetrics fontMetrics;
 	private int textLineHeight;
 	private int fullLineHeight;
@@ -59,22 +66,41 @@ public class SourceEditor implements DComponent {
 	private int mouseDownY = -1;
 	private boolean dragging = false;
 	
-	public SourceEditor(IDESourceFile sourceFile) {
+	private final IDEWindow window;
+	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, ColorableCodeIcon.INSTANCE, "Edit", "Source code editor");
+	
+	public SourceEditor(DStyleClass styleClass, IDEWindow window, IDESourceFile sourceFile) {
+		this.styleClass = styleClass;
+		this.window = window;
 		this.sourceFile = sourceFile;
+		
 		tokens = new TokenModel(sourceFile.getName(), tab.length());
 		tokenListener = tokens.addListener(new TokenListener());
 		
+		editToolbar.controls.add(() -> new IconButtonControl(SaveIcon.INSTANCE, e -> save()));
+		window.aspectBar.addToolbar(editToolbar);
+		
 		try {
-			TokenParser<ZSToken, ZSTokenType> parser = ZSTokenParser.createRaw(sourceFile.getName(), new ReaderCharReader(sourceFile.read()), tab.length());
+			TokenParser<ZSToken, ZSTokenType> parser = ZSTokenParser.createRaw(
+					sourceFile.getName(),
+					new ReaderCharReader(sourceFile.read()),
+					tab.length());
 			tokens.set(parser);
 		} catch (IOException ex) {
 			ex.printStackTrace();
 		}
 	}
+	
+	@Override
+	public void close() {
+		window.aspectBar.removeToolbar(editToolbar);
+	}
 
 	@Override
-	public void setContext(DDrawingContext context) {
+	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
+		this.style = new SourceEditorStyle(context.getStylesheets().get(context, parent.getChild("sourceeditor", styleClass)));
+		
 		fontMetrics = context.getFontMetrics(font);
 		textLineHeight = fontMetrics.getAscent() + fontMetrics.getDescent();
 		fullLineHeight = textLineHeight + fontMetrics.getLeading() + style.extraLineSpacing;
@@ -90,28 +116,32 @@ public class SourceEditor implements DComponent {
 	}
 
 	@Override
-	public DRectangle getBounds() {
+	public DIRectangle getBounds() {
 		return bounds;
 	}
 
 	@Override
-	public void setBounds(DRectangle bounds) {
+	public void setBounds(DIRectangle bounds) {
 		this.bounds = bounds;
 	}
 
 	@Override
 	public void paint(DCanvas canvas) {
 		DIRectangle canvasBounds = canvas.getBounds();
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, 0xFFFFFFFF);
-		
-		lineBarWidth = Math.max(50, fontMetrics.getWidth(Integer.toString(tokens.getLineCount()))) + 5;
-		canvas.fillRectangle(bounds.x, bounds.y, lineBarWidth, bounds.height, 0xFFE9E8E2);
-		canvas.strokePath(tracer -> {
-			tracer.moveTo(bounds.x + lineBarWidth, bounds.y);
-			tracer.lineTo(bounds.x + lineBarWidth, bounds.y + bounds.height);
-		}, DTransform2D.IDENTITY, 0xFFA0A0A0, 1);
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		
+		lineBarWidth = Math.max(style.lineBarMinWidth, fontMetrics.getWidth(Integer.toString(tokens.getLineCount())))
+				+ style.lineBarSpacingLeft
+				+ style.lineBarSpacingRight;
+		canvas.fillRectangle(bounds.x, bounds.y, lineBarWidth, bounds.height, style.lineBarBackgroundColor);
+		if (style.lineBarStrokeWidth > 0) {
+			canvas.strokePath(tracer -> {
+				tracer.moveTo(bounds.x + lineBarWidth, bounds.y);
+				tracer.lineTo(bounds.x + lineBarWidth, bounds.y + bounds.height);
+			}, DTransform2D.IDENTITY, style.lineBarStrokeColor, style.lineBarStrokeWidth);
+		}
 		
-		int x = bounds.x + lineBarWidth + 10;
+		int x = bounds.x + lineBarWidth + style.lineBarMargin;
 		if (cursorEnd != null)
 			canvas.fillRectangle(x, lineToY(cursorEnd.line), bounds.width - x, selectionLineHeight, style.currentLineHighlight);
 		
@@ -144,14 +174,14 @@ public class SourceEditor implements DComponent {
 		for (TokenLine line : tokens.getLines()) {
 			if (y + textLineHeight  >= canvasBounds.y && y < canvasBounds.y + canvasBounds.height) {
 				String lineNumber = Integer.toString(lineIndex);
-				int lineNumberX = x - 15 - (int)canvas.measureTextLength(font, lineNumber);
-				canvas.drawText(font, 0xFFA0A0A0, lineNumberX, y + fontMetrics.getAscent(), lineNumber);
+				int lineNumberX = x - style.lineBarSpacingRight - style.lineBarMargin - fontMetrics.getWidth(lineNumber);
+				canvas.drawText(font, style.lineBarTextColor, lineNumberX, y + fontMetrics.getAscent(), lineNumber);
 
 				int lineX = x;
 				for (ZSToken token : line.getTokens()) {
 					String content = getDisplayContent(token);
 					canvas.drawText(font, TokenClass.get(token.type).color, lineX, y + fontMetrics.getAscent(), content);
-					lineX += canvas.measureTextLength(font, content);
+					lineX += fontMetrics.getWidth(content);
 				}
 			}
 			
@@ -162,18 +192,18 @@ public class SourceEditor implements DComponent {
 		if (cursorEnd != null && cursorBlink) {
 			int cursorX = getX(cursorEnd);
 			int cursorY = getY(cursorEnd);
-			canvas.fillRectangle(cursorX, cursorY, 2, selectionLineHeight, 0xFF000000);
+			canvas.fillRectangle(cursorX, cursorY, style.cursorWidth, selectionLineHeight, style.cursorColor);
 		}
 	}
 	
 	@Override
 	public void onMouseEnter(DMouseEvent e) {
-		context.setCursor(DDrawingContext.Cursor.TEXT);
+		context.setCursor(DUIContext.Cursor.TEXT);
 	}
 	
 	@Override
 	public void onMouseExit(DMouseEvent e) {
-		context.setCursor(DDrawingContext.Cursor.NORMAL);
+		context.setCursor(DUIContext.Cursor.NORMAL);
 	}
 	
 	@Override
@@ -530,9 +560,9 @@ public class SourceEditor implements DComponent {
 	
 	public int getX(SourcePosition position) {
 		int x = bounds.x + lineBarWidth + 10;
-		TokenLine lineData = tokens.getLine(position.line);
-		
 		TokenModel.Position tokenPosition = position.asTokenPosition();
+		TokenLine lineData = tokens.getLine(tokenPosition.line);
+		
 		for (int i = 0; i < tokenPosition.token; i++)
 			x += fontMetrics.getWidth(getDisplayContent(lineData.getToken(i)));
 		if (tokenPosition.offset > 0)
@@ -553,7 +583,7 @@ public class SourceEditor implements DComponent {
 		dimensionPreferences.setValue(new DDimensionPreferences(0, fullLineHeight * tokens.getLineCount()));
 		
 		if (bounds != null)
-			context.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
+			context.repaint(bounds);
 	}
 	
 	private class TokenListener implements TokenModel.Listener {

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

@@ -5,29 +5,50 @@
  */
 package org.openzen.zenscript.ide.ui.view.editor;
 
+import org.openzen.drawablegui.dimension.DDpDimension;
+import org.openzen.drawablegui.dimension.DPxDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
 /**
  *
  * @author Hoofdgebruiker
  */
 public class SourceEditorStyle {
-	public static final SourceEditorStyle DEFAULT = new SourceEditorStyle(3, 0xFFE9EFF8, 0xFFB0C5E3, 2, 2);
-	
+	public final int backgroundColor;
+	public final int lineBarBackgroundColor;
+	public final int lineBarStrokeColor;
+	public final int lineBarStrokeWidth;
+	public final int lineBarMinWidth;
+	public final int lineBarSpacingLeft;
+	public final int lineBarSpacingRight;
+	public final int lineBarMargin;
+	public final int lineBarTextColor;
 	public final int extraLineSpacing;
 	public final int currentLineHighlight;
 	public final int selectionColor;
 	public final int selectionPaddingTop;
 	public final int selectionPaddingBottom;
+	public final int cursorWidth;
+	public final int cursorColor;
 	
-	public SourceEditorStyle(
-			int extraLineSpacing,
-			int currentLineHighlight,
-			int selectionColor,
-			int selectionPaddingTop,
-			int selectionPaddingBottom) {
-		this.extraLineSpacing = extraLineSpacing;
-		this.currentLineHighlight = currentLineHighlight;
-		this.selectionColor = selectionColor;
-		this.selectionPaddingTop = selectionPaddingTop;
-		this.selectionPaddingBottom = selectionPaddingBottom;
+	public SourceEditorStyle(DStyleDefinition style) {
+		this.backgroundColor = style.getColor("backgroundColor", 0xFFFFFFFF);
+		this.lineBarBackgroundColor = style.getColor("lineBarBackgroundColor", 0xFFE9E8E2);
+		this.lineBarStrokeColor = style.getColor("lineBarStrokeColor", 0xFFA0A0A0);
+		this.lineBarStrokeWidth = style.getDimension("lineBarStrokeWidth", new DPxDimension(1));
+		this.lineBarMinWidth = style.getDimension("lineBarMinWidth", new DDpDimension(30));
+		this.lineBarSpacingLeft = style.getDimension("lineBarSpacingLeft", new DDpDimension(5));
+		this.lineBarSpacingRight = style.getDimension("lineBarSpacingRight", new DDpDimension(2));
+		this.lineBarMargin = style.getDimension("lineBarMargin", new DDpDimension(7));
+		this.lineBarTextColor = style.getColor("lineBarTextColor", 0xFFA0A0A0);
+		
+		this.extraLineSpacing = style.getDimension("extraLineSpacing", new DDpDimension(2));
+		this.currentLineHighlight = style.getColor("currentLineHighlight", 0xFFE9EFF8);
+		this.selectionColor = style.getColor("selectionColor", 0xFFB0C5E3);
+		this.selectionPaddingTop = style.getDimension("selectionPaddingTop", new DDpDimension(1));
+		this.selectionPaddingBottom = style.getDimension("selectionPaddingBottom", new DDpDimension(1));
+		
+		this.cursorWidth = style.getDimension("cursorWidth", new DDpDimension(1));
+		this.cursorColor = style.getColor("cursorColor", 0xFF000000);
 	}
 }

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

@@ -73,7 +73,7 @@ public class TokenModel {
 		if (line < 0)
 			line = 0;
 		if (line >= lines.size())
-			return new Position(lines.size(), lines.get(lines.size() - 1).getTokenCount(), 0);
+			return new Position(lines.size() - 1, lines.get(lines.size() - 1).getTokenCount(), 0);
 		
 		int token = 0;
 		int tokenOffset = 0;