- Removed old paint code

- Fixed some minor UI bugs

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

@@ -1,67 +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;
-
-import org.openzen.drawablegui.style.DShadow;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface DCanvas {
-	void pushBounds(DIRectangle bounds);
-	
-	void popBounds();
-	
-	void pushOffset(int x, int y);
-	
-	void popOffset();
-	
-	DIRectangle getBounds();
-	
-	DUIContext getContext();
-	
-	void drawText(DFont font, int color, float x, float y, String text);
-	
-	/**
-	 * Strokes a given path.
-	 * 
-	 * @param path path to be stroked
-	 * @param transform path transform
-	 * @param color path color
-	 * @param lineWidth path line width
-	 */
-	void strokePath(DPath path, DTransform2D transform, int color, float lineWidth);
-	
-	/**
-	 * Fills a given path.
-	 * 
-	 * @param path path to be filled
-	 * @param transform 
-	 * @param color
-	 */
-	void fillPath(DPath path, DTransform2D transform, int color);
-	
-	/**
-	 * Draws the shadow for a given path.
-	 * 
-	 * @param path
-	 * @param transform
-	 * @param shadow
-	 */
-	void shadowPath(DPath path, DTransform2D transform, int color, DShadow shadow);
-	
-	/**
-	 * Fills a rectangle.
-	 * 
-	 * @param x
-	 * @param y
-	 * @param width
-	 * @param height
-	 * @param color 
-	 */
-	void fillRectangle(int x, int y, int width, int height, int color);
-}

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

@@ -12,8 +12,6 @@ import org.openzen.drawablegui.draw.DDrawTarget;
  * @author Hoofdgebruiker
  */
 public interface DColorableIcon {
-	void draw(DCanvas canvas, DTransform2D transform, int color);
-	
 	void draw(DDrawTarget target, int z, DTransform2D transform, int color);
 	
 	float getNominalWidth();

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

@@ -21,12 +21,6 @@ public class DCompositeIcon implements DColorableIcon {
 		this.addition = addition;
 		this.additionTransform = additionTransform;
 	}
-
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		base.draw(canvas, transform, color);
-		addition.draw(canvas, transform.mul(additionTransform), color);
-	}
 	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {

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

@@ -12,8 +12,6 @@ import org.openzen.drawablegui.draw.DDrawTarget;
  * @author Hoofdgebruiker
  */
 public interface DDrawable {
-	void draw(DCanvas canvas, DTransform2D transform);
-	
 	void draw(DDrawTarget target, int z, DTransform2D transform);
 	
 	float getNominalWidth();

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.border;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DMouseEvent;
@@ -154,7 +153,6 @@ public class DCustomWindowBorder implements DComponent {
 				background.setRectangle(bounds);
 			}
 		}
-		surface.repaint(bounds);
 	}
 
 	@Override

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.border;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.draw.DDrawSurface;
 

DrawableGui/src/main/java/org/openzen/drawablegui/draw/DDrawSurface.java

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.draw;
 
-import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.style.DStyleDefinition;
 import org.openzen.drawablegui.style.DStylePath;
@@ -20,10 +19,4 @@ public interface DDrawSurface extends DDrawTarget {
 	DStyleDefinition getStylesheet(DStylePath path);
 	
 	DSubSurface createSubSurface(int z);
-	
-	void repaint(int x, int y, int width, int height);
-	
-	default void repaint(DIRectangle rectangle) {
-		repaint(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
-	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/draw/DSubSurface.java

@@ -21,6 +21,4 @@ public interface DSubSurface extends DDrawnElement, DDrawSurface {
 	void setOffset(int x, int y);
 	
 	void setClip(DIRectangle bounds);
-	
-	void repaint();
 }

DrawableGui/src/main/java/org/openzen/drawablegui/form/DForm.java

@@ -8,7 +8,6 @@ package org.openzen.drawablegui.form;
 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.DSizing;
 import org.openzen.drawablegui.DFontMetrics;

DrawableGui/src/main/java/org/openzen/drawablegui/layout/DLinearLayout.java

@@ -8,7 +8,6 @@ package org.openzen.drawablegui.layout;
 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.DIRectangle;
 import org.openzen.drawablegui.DSizing;

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

@@ -11,7 +11,6 @@ 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.DIRectangle;
 import org.openzen.drawablegui.DSizing;
@@ -63,7 +62,6 @@ public class DSideLayout extends BaseComponentGroup {
 		if (surface != null && bounds != null) {
 			main.mount(path, z + 1, surface);
 			setBounds(bounds);
-			surface.repaint(bounds);
 		}
 	}
 

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.scroll;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DMouseEvent;
@@ -172,7 +171,6 @@ public class DScrollBar implements DComponent {
 		
 		this.hovering = hovering;
 		updateBarColor();
-		surface.repaint(bounds.x, fromY, bounds.width, toY - fromY);
 	}
 	
 	private void setDragging(boolean dragging) {
@@ -181,7 +179,6 @@ public class DScrollBar implements DComponent {
 		
 		this.dragging = dragging;
 		updateBarColor();
-		surface.repaint(bounds.x, fromY, bounds.width, toY - fromY);
 	}
 	
 	private void recalculate() {

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

@@ -6,7 +6,6 @@
 package org.openzen.drawablegui.scroll;
 
 import org.openzen.drawablegui.DAnchor;
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DClipboard;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;

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

@@ -1,212 +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.swing;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-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.DIRectangle;
-import org.openzen.drawablegui.DPath;
-import org.openzen.drawablegui.DPathBoundsCalculator;
-import org.openzen.drawablegui.DUIContext;
-import org.openzen.drawablegui.style.DShadow;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class SwingCanvas implements DCanvas {
-	private final Graphics2D g;
-	private final SwingGraphicsContext context;
-	private final Stack<Rectangle> bounds = new Stack<>();
-	private final Stack<AffineTransform> transformStack = new Stack<>();
-	
-	public SwingCanvas(Graphics2D g, SwingGraphicsContext context, DIRectangle bounds) {
-		this.g = g;
-		
-		this.context = context;
-		
-		if (bounds != null)
-			pushBounds(new DIRectangle(bounds.x, bounds.y, bounds.width, bounds.height));
-	}
-	
-	@Override
-	public void pushBounds(DIRectangle bounds) {
-		this.bounds.push(g.getClipBounds());
-		g.setClip(bounds.x, bounds.y, bounds.width, bounds.height);
-	}
-	
-	@Override
-	public void popBounds() {
-		Rectangle bounds = this.bounds.pop();
-		g.setClip(bounds.x, bounds.y, bounds.width, bounds.height);
-	}
-	
-	@Override
-	public void pushOffset(int x, int y) {
-		transformStack.push(g.getTransform());
-		g.transform(AffineTransform.getTranslateInstance(x, y));
-	}
-	
-	@Override
-	public void popOffset() {
-		g.setTransform(transformStack.pop());
-	}
-	
-	@Override
-	public DIRectangle getBounds() {
-		Rectangle bounds = g.getClipBounds();
-		return new DIRectangle(bounds.x, bounds.y, bounds.width, bounds.height);
-	}
-
-	@Override
-	public void drawText(DFont font, int color, float x, float y, String text) {
-		prepare(font);
-		g.setColor(new Color(color, true));
-		g.setFont((Font) font.cached);
-		g.drawString(text, x, y);
-	}
-
-	@Override
-	public DUIContext getContext() {
-		return context;
-	}
-
-	@Override
-	public void strokePath(DPath path, DTransform2D transform, int color, float lineWidth) {
-		if (color == 0)
-			return;
-		
-		AffineTransform old = g.getTransform();
-		GeneralPath jPath = context.getPath(path);
-		g.setColor(new Color(color, true));
-		g.setStroke(new BasicStroke(lineWidth));
-		g.transform(getTransform(transform));
-		g.draw(jPath);
-		g.setTransform(old);
-	}
-
-	@Override
-	public void fillPath(DPath path, DTransform2D transform, int color) {
-		if (color == 0)
-			return;
-		
-		AffineTransform old = g.getTransform();
-		GeneralPath jPath = context.getPath(path);
-		g.setColor(new Color(color, true));
-		g.transform(getTransform(transform));
-		g.fill(jPath);
-		g.setTransform(old);
-	}
-
-	@Override
-	public void shadowPath(DPath path, DTransform2D transform, int color, DShadow shadow) {
-		if (shadow.color == 0) {
-			fillPath(path, transform, color);
-			return;
-		}
-		
-		if (shadow.radius == 0) {
-			fillPath(path, transform, shadow.color);
-			fillPath(path, transform, color);
-			return;
-		}
-		
-		DIRectangle bounds = DPathBoundsCalculator.getBounds(path, transform.offset(shadow.offsetX, shadow.offsetY));
-		int offset = 2 * (int)Math.ceil(shadow.radius);
-		
-		GeneralPath jPath = context.getPath(path);
-		
-		BufferedImage image = new BufferedImage(bounds.width + 2 * offset, bounds.height + 2 * offset, BufferedImage.TYPE_INT_ARGB_PRE);
-		Graphics2D imageG = (Graphics2D) image.getGraphics();
-		
-		imageG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		imageG.setColor(new Color(shadow.color, true));
-		imageG.setTransform(getTransform(transform.offset(offset + shadow.offsetX - bounds.x, offset + shadow.offsetY - bounds.y)));
-		imageG.fill(jPath);
-		
-		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), true).filter(image, null);
-		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), false).filter(image, null);
-		g.drawImage(image, bounds.x - offset, bounds.y - offset, null);
-		
-		fillPath(path, transform, color);
-	}
-
-	@Override
-	public void fillRectangle(int x, int y, int width, int height, int color) {
-		if (color == 0)
-			return;
-		
-		g.setColor(new Color(color, true));
-		g.fillRect(x, y, width, height);
-	}
-	
-	public static void prepare(DFont font) {
-		if (font.cached != null && font.cached instanceof Font)
-			return;
-		
-		String baseFontName = font.family == DFontFamily.CODE ? "Consolas" : Font.DIALOG;
-		int style = 0;
-		if (font.bold)
-			style |= Font.BOLD;
-		if (font.italic)
-			style |= Font.ITALIC;
-		
-		font.cached = Font.decode(baseFontName).deriveFont(style, font.size);
-	}
-	
-	public static 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/SwingDrawSurface.java

@@ -5,16 +5,19 @@
  */
 package org.openzen.drawablegui.swing;
 
+import java.awt.Font;
 import java.awt.Graphics2D;
-import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.image.ConvolveOp;
+import java.awt.image.Kernel;
 import java.util.ArrayList;
 import java.util.List;
 import org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.draw.DDrawSurface;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnShape;
@@ -125,13 +128,11 @@ public class SwingDrawSurface implements DDrawSurface {
 		elements.remove(element);
 		repaint(element.getBounds());
 	}
-
-	@Override
+	
 	public void repaint(int x, int y, int width, int height) {
 		context.repaint(x + offsetX, y + offsetY, width, height);
 	}
 	
-	@Override
 	public void repaint(DIRectangle rectangle) {
 		context.repaint(rectangle.offset(offsetX, offsetY));
 	}
@@ -145,4 +146,57 @@ public class SwingDrawSurface implements DDrawSurface {
 		repaint(element.getBounds());
 		return element;
 	}
+	
+	public static void prepare(DFont font) {
+		if (font.cached != null && font.cached instanceof Font)
+			return;
+		
+		String baseFontName = font.family == DFontFamily.CODE ? "Consolas" : Font.DIALOG;
+		int style = 0;
+		if (font.bold)
+			style |= Font.BOLD;
+		if (font.italic)
+			style |= Font.ITALIC;
+		
+		font.cached = Font.decode(baseFontName).deriveFont(style, font.size);
+	}
+	
+	public static 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/SwingDrawnText.java

@@ -11,7 +11,6 @@ import java.awt.Graphics2D;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.draw.DDrawnText;
-import static org.openzen.drawablegui.swing.SwingCanvas.prepare;
 
 /**
  *
@@ -29,7 +28,7 @@ public class SwingDrawnText extends SwingDrawnElement implements DDrawnText {
 	
 	public SwingDrawnText(SwingDrawSurface target, int z, float x, float y, int color, DFont font, String text, int ascent, int descent, int width) {
 		super(target, z);
-		prepare(font);
+		SwingDrawSurface.prepare(font);
 		
 		this.x = x;
 		this.y = y;

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

@@ -14,7 +14,6 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DPathBoundsCalculator;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawnShape;
-import static org.openzen.drawablegui.swing.SwingCanvas.getTransform;
 
 /**
  *
@@ -41,13 +40,13 @@ public class SwingFilledPath extends SwingDrawnElement implements DDrawnShape {
 		this.path = path;
 		
 		this.awtColor = color == 0 ? null : new Color(color, true);
-		this.transform = getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 		this.bounds = DPathBoundsCalculator.getBounds(originalPath, transform);
 	}
 
 	@Override
 	public void setTransform(DTransform2D transform) {
-		this.transform = getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 		this.bounds = DPathBoundsCalculator.getBounds(originalPath, transform);
 	}
 	

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

@@ -128,7 +128,7 @@ public class SwingGraphicsContext implements DUIContext {
 		if (graphics == null)
 			throw new AssertionError("No graphics available!");
 		
-		SwingCanvas.prepare(font);
+		SwingDrawSurface.prepare(font);
 		return new SwingFontMetrics(graphics.getFontMetrics((Font) font.cached), graphics);
 	}
 

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

@@ -17,8 +17,6 @@ import org.openzen.drawablegui.DPathBoundsCalculator;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.style.DShadow;
-import static org.openzen.drawablegui.swing.SwingCanvas.getGaussianBlurFilter;
-import static org.openzen.drawablegui.swing.SwingCanvas.getTransform;
 
 /**
  *
@@ -45,7 +43,7 @@ public class SwingShadowedPath extends SwingDrawnElement implements DDrawnShape
 			DShadow shadow) {
 		super(target, z);
 		
-		this.transform = getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 		this.originalPath = originalPath;
 		this.path = path;
 		this.awtColor = new Color(color, true);
@@ -58,11 +56,11 @@ public class SwingShadowedPath extends SwingDrawnElement implements DDrawnShape
 		
 		imageG.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		imageG.setColor(new Color(shadow.color, true));
-		imageG.setTransform(getTransform(transform.offset(shadowOffset + shadow.offsetX - shadowBounds.x, shadowOffset + shadow.offsetY - shadowBounds.y)));
+		imageG.setTransform(SwingDrawSurface.getTransform(transform.offset(shadowOffset + shadow.offsetX - shadowBounds.x, shadowOffset + shadow.offsetY - shadowBounds.y)));
 		imageG.fill(path);
 		
-		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), true).filter(image, null);
-		image = getGaussianBlurFilter((int)Math.ceil(shadow.radius), false).filter(image, null);
+		image = SwingDrawSurface.getGaussianBlurFilter((int)Math.ceil(shadow.radius), true).filter(image, null);
+		image = SwingDrawSurface.getGaussianBlurFilter((int)Math.ceil(shadow.radius), false).filter(image, null);
 		shadowImage = image;
 		
 		bounds = new DIRectangle(
@@ -74,7 +72,7 @@ public class SwingShadowedPath extends SwingDrawnElement implements DDrawnShape
 
 	@Override
 	public void setTransform(DTransform2D transform) {
-		this.transform = getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 	}
 	
 	@Override

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

@@ -39,7 +39,7 @@ public class SwingStrokedPath extends SwingDrawnElement implements DDrawnShape {
 			float lineWidth) {
 		super(target, z);
 		
-		this.transform = SwingCanvas.getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 		this.awtColor = color == 0 ? null : new Color(color, true);
 		this.originalPath = originalPath;
 		this.path = path;
@@ -50,7 +50,7 @@ public class SwingStrokedPath extends SwingDrawnElement implements DDrawnShape {
 	@Override
 	public void setTransform(DTransform2D transform) {
 		invalidate();
-		this.transform = SwingCanvas.getTransform(transform);
+		this.transform = SwingDrawSurface.getTransform(transform);
 		this.bounds = DPathBoundsCalculator.getBounds(originalPath, transform);
 		invalidate();
 	}

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

@@ -127,28 +127,7 @@ public class SwingSubSurface extends SwingDrawnElement implements DSubSurface {
 	public DSubSurface createSubSurface(int z) {
 		return surface.createSubSurface(z);
 	}
-
-	@Override
-	public void repaint(int x, int y, int width, int height) {
-		int left = toGlobalX(x);
-		int top = toGlobalY(y);
-		int right = left + width;
-		int bottom = top + height;
-
-		if (clip != null) {
-			left = Math.max(clip.x, left);
-			top = Math.max(clip.y, top);
-			right = Math.min(clip.x + clip.width, right);
-			bottom = Math.min(clip.y + clip.height, bottom);
-		}
-
-		if (left >= right || top >= bottom)
-			return;
-
-		target.repaint(left, top, right - left, bottom - top);
-	}
 	
-	@Override
 	public void repaint() {
 		DIRectangle bounds = surface.calculateBounds().offset(surface.offsetX, surface.offsetY);
 		if (clip != null)
@@ -156,20 +135,4 @@ public class SwingSubSurface extends SwingDrawnElement implements DSubSurface {
 		
 		target.repaint(bounds);
 	}
-
-	private int toGlobalX(int x) {
-		return x + surface.offsetX;
-	}
-
-	private int toGlobalY(int y) {
-		return y + surface.offsetY;
-	}
-
-	private int toLocalX(int x) {
-		return x - surface.offsetX;
-	}
-
-	private int toLocalY(int y) {
-		return y - surface.offsetY;
-	}
 }

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.tree;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawTarget;
@@ -18,11 +17,6 @@ public class CollapsedArrow implements DDrawable {
 	public static final CollapsedArrow INSTANCE = new CollapsedArrow();
 	
 	private CollapsedArrow() {}
-
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ColoredCollapsedArrow.INSTANCE.draw(canvas, transform, 0xFF000000);
-	}
 	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform) {

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.tree;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
@@ -23,11 +22,6 @@ public class ColoredCollapsedArrow implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH_0, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH_0, transform, color);

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

@@ -50,6 +50,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 	private final N root;
 	private final boolean showRoot;
 	private final List<Row> rows = new ArrayList<>();
+	private boolean selectedIsPresent = false;
 	
 	private DDrawnRectangle background;
 	private DDrawnRectangle selectedBackground;
@@ -163,20 +164,10 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 				row.nodeIcon.setColor(style.selectedNodeTextColor);
 				
 				if (oldRowIndex >= 0) {
-					surface.repaint(
-							bounds.x,
-							rowToY(oldRowIndex) - style.selectedPaddingTop,
-							bounds.width,
-							fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom);
 					Row oldRow = rows.get(oldRowIndex);
 					oldRow.text.setColor(style.nodeTextColor);
 					oldRow.nodeIcon.setColor(style.nodeTextColor);
 				}
-				surface.repaint(
-						bounds.x,
-						rowToY(rowIndex) - style.selectedPaddingTop,
-						bounds.width,
-						fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom);
 			}
 		}
 	}
@@ -196,6 +187,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			row.close();
 		
 		rows.clear();
+		selectedIsPresent = false;
 		
 		if (showRoot) {
 			updateLayout(root, 0);
@@ -205,6 +197,12 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			}
 		}
 		
+		if (!selectedIsPresent) {
+			selectedNode = null;
+			selectedRow = -1;
+			selectedBackground.setColor(0);
+		}
+		
 		if (rows.size() != oldRowCount) {
 			DSizing preferences = sizing.getValue();
 			sizing.setValue(new DSizing(
@@ -254,6 +252,9 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			this.collapseListener = node.isCollapsed().addListener(this);
 			this.childListener = node.getChildren().addListener(this);
 			
+			if (node == selectedNode)
+				selectedIsPresent = true;
+			
 			int baseX = bounds.x + style.padding + x;
 			int baseY = (int)(bounds.y + style.padding + index * (fontMetrics.getAscent() + fontMetrics.getDescent() + style.rowSpacing));
 			
@@ -263,7 +264,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 					z + 2,
 					node.getIcon(),
 					DTransform2D.translate(baseX + icon.getNominalWidth() + style.iconTextSpacing, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()),
-					style.nodeTextColor);
+					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor);
 			
 			if (!node.isLeaf())
 				collapseIcon = new DDrawableInstance(
@@ -275,7 +276,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			text = surface.drawText(
 					z + 2,
 					style.font,
-					style.nodeTextColor,
+					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor,
 					baseX + style.iconTextSpacing + icon.getNominalWidth() + style.iconTextSpacing + node.getIcon().getNominalWidth(),
 					baseY + fontMetrics.getAscent(),
 					node.getTitle());

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.tree;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.draw.DDrawTarget;
@@ -19,11 +18,6 @@ public class ExpandedArrow implements DDrawable {
 	
 	private ExpandedArrow() {}
 
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		ExpandedColoredArrow.INSTANCE.draw(canvas, transform, 0xFF000000);
-	}
-
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform) {
 		ExpandedColoredArrow.INSTANCE.draw(target, z, transform, 0xFF000000);

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui.tree;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
@@ -23,11 +22,6 @@ public class ExpandedColoredArrow implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH_0, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH_0, transform, color);

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

@@ -72,16 +72,9 @@ public class Main {
 		
 		output.append("\t\n");
 		output.append("\t@Override\n");
-		output.append("\tpublic void draw(DCanvas canvas, DTransform2D transform, int color) {\n");
+		output.append("\tpublic void draw(DDrawTarget target, int z, DTransform2D transform, int color) {\n");
 		for (String pathName : pathNames) {
-			output.append("\t\tcanvas.fillPath(").append(pathName).append(", transform, color);\n");
-		}
-		output.append("\t}\n");
-		output.append("\n");
-		output.append("\t@Override\n");
-		output.append("\tpublic void draw(DDrawTarget target, int z, DTransform2D transform) {\n");
-		for (String pathName : pathNames) {
-			output.append("\t\target.fillPath(z, ").append(pathName).append(", transform, DDrawTarget.INSTANCE_COLOR);\n");
+			output.append("\t\target.fillPath(z, ").append(pathName).append(", transform, color);\n");
 		}
 		output.append("\t}\n");
 		output.append("\n");

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

@@ -4,12 +4,10 @@
  * 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;
 import org.openzen.drawablegui.draw.DDrawTarget;
-import org.openzen.drawablegui.style.DShadow;
 
 public class AddBoxIcon implements DColorableIcon {
 	public static final AddBoxIcon INSTANCE = new AddBoxIcon();
@@ -48,11 +46,6 @@ public class AddBoxIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, color, new DShadow(0xFF999999, 0, 1, 6));
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -4,7 +4,6 @@
  * 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;
@@ -35,11 +34,6 @@ public class BuildIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.shadowPath(z, PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -26,11 +25,6 @@ public class ChevronRight implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -32,11 +31,6 @@ public class CloseIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -37,11 +36,6 @@ public class CodeIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -24,11 +23,6 @@ public class ColoredIcon implements DDrawable {
 		this.color = color;
 	}
 
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform) {
-		icon.draw(canvas, transform, color);
-	}
-
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform) {
 		icon.draw(target, z, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -32,11 +31,6 @@ public class FolderIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -9,7 +9,6 @@ package org.openzen.zenscript.ide.ui.icons;
  *
  * @author Hoofdgebruiker
  */
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
@@ -44,11 +43,6 @@ public class LibraryIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -38,11 +37,6 @@ public class ModuleIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -4,7 +4,6 @@
  * 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;
@@ -25,11 +24,6 @@ public class PlayIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.shadowPath(z, PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -45,11 +44,6 @@ public class ProjectIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -43,11 +42,6 @@ public class SaveIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -25,11 +24,6 @@ public class ScalableCloseIcon implements DColorableIcon {
 		};
 	}
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.strokePath(path, transform, color, 1);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.strokePath(z, path, transform, color, 1);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -26,11 +25,6 @@ public class ScalableMaximizeIcon implements DColorableIcon {
 		};
 	}
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.strokePath(path, transform, color, 1);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.strokePath(z, path, transform, color, 1);

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.ide.ui.icons;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
@@ -26,11 +25,6 @@ public class ScalableMinimizeIcon implements DColorableIcon {
 			tracer.lineTo(scale * 16, scale * 14);
 		};
 	}
-
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.strokePath(path, transform, color, 1);
-	}
 	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {

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

@@ -4,12 +4,10 @@
  * 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;
 import org.openzen.drawablegui.draw.DDrawTarget;
-import org.openzen.drawablegui.style.DShadow;
 
 public class SettingsIcon implements DColorableIcon {
 	public static final SettingsIcon INSTANCE = new SettingsIcon();
@@ -67,11 +65,6 @@ public class SettingsIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, color, new DShadow(0xFF888888, 0, 1, 4));
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -37,11 +36,6 @@ public class ShadedCodeIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -45,11 +44,6 @@ public class ShadedProjectIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.fillPath(PATH, transform, color);
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
 		target.fillPath(z, PATH, transform, color);

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -44,14 +43,9 @@ public class ShadedSaveIcon implements DColorableIcon {
 		tracer.close();
 	};
 	
-	@Override
-	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		canvas.shadowPath(PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
-	}
-	
 	@Override
 	public void draw(DDrawTarget target, int z, DTransform2D transform, int color) {
-		target.fillPath(z, PATH, transform, color);
+		target.shadowPath(z, PATH, transform, color, new DShadow(0xFFCCCCCC, 0, 1, 4));
 	}
 
 	@Override

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

@@ -6,7 +6,6 @@
 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.DSizing;
 import org.openzen.drawablegui.DDrawable;

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFontMetrics;

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

@@ -10,7 +10,6 @@ import java.util.Map;
 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.DSizing;
 import org.openzen.drawablegui.DFontMetrics;
@@ -72,12 +71,12 @@ public class TabbedView extends BaseComponentGroup {
 			
 			if (newValue != null && bounds != null) {
 				DIRectangle contentBounds = new DIRectangle(
-					bounds.x, bounds.y + totalTabHeight,
-					bounds.width, bounds.height - totalTabHeight);
+						bounds.x + style.margin.left,
+						bounds.y + style.margin.top + totalTabHeight,
+						bounds.width - style.margin.getHorizontal(),
+						bounds.height - style.margin.getVertical() - totalTabHeight);
 				newValue.content.setBounds(contentBounds);
 			}
-			if (newValue == null && surface != null && bounds != null)
-				surface.repaint(bounds);
 		});
 	}
 	
@@ -126,8 +125,10 @@ public class TabbedView extends BaseComponentGroup {
 			return;
 		
 		DIRectangle contentBounds = new DIRectangle(
-				bounds.x, bounds.y + totalTabHeight,
-				bounds.width, bounds.height - totalTabHeight);
+				bounds.x + style.margin.left,
+				bounds.y + style.margin.top + totalTabHeight,
+				bounds.width - style.margin.getHorizontal(),
+				bounds.height - style.margin.getVertical() - totalTabHeight);
 		currentTab.getValue().content.setBounds(contentBounds);
 		layoutTabs();
 	}
@@ -144,10 +145,6 @@ public class TabbedView extends BaseComponentGroup {
 			tab.close();
 	}
 	
-	private void repaintTabs() {
-		surface.repaint(bounds.x, bounds.y, bounds.width, totalTabHeight);
-	}
-	
 	private void prepare(TabbedViewComponent tab) {
 		tab.content.mount(path, z + 1, surface);
 	}
@@ -156,16 +153,14 @@ public class TabbedView extends BaseComponentGroup {
 		if (bounds == null)
 			return;
 		
-		int x = bounds.x + style.tabBarSpacingLeft;
+		int x = bounds.x + style.margin.left + style.tabBarSpacingLeft;
 		for (DComponent tab : tabComponents) {
 			DSizing preferences = tab.getSizing().getValue();
 			tab.setBounds(new DIRectangle(
-					x, bounds.y + totalTabHeight - preferences.preferredHeight, preferences.preferredWidth, preferences.preferredHeight));
+					x, bounds.y + style.margin.top + totalTabHeight - preferences.preferredHeight, preferences.preferredWidth, preferences.preferredHeight));
 			
 			x += preferences.preferredWidth + style.tabSpacing;
 		}
-		
-		repaintTabs();
 	}
 
 	@Override
@@ -206,7 +201,7 @@ public class TabbedView extends BaseComponentGroup {
 
 		@Override
 		public void onChanged(int index, TabbedViewComponent oldValue, TabbedViewComponent newValue) {
-			repaintTabs();
+			
 		}
 
 		@Override

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFontMetrics;

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

@@ -6,11 +6,13 @@
 package org.openzen.zenscript.ide.ui.view;
 
 import org.openzen.drawablegui.DEmptyView;
+import org.openzen.drawablegui.border.DLineBorder;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.layout.DSideLayout;
 import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.SimpleLiveInt;
 import org.openzen.drawablegui.live.SimpleLiveString;
+import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylesheetBuilder;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
@@ -56,7 +58,10 @@ public final class WindowView extends DSideLayout {
 			TabbedViewComponent tab = new TabbedViewComponent(
 					sourceFile.getName(),
 					null,
-					new DScrollPane(DStyleClass.EMPTY, editor, new SimpleLiveInt(0)),
+					new DScrollPane(DStyleClass.inline(new DStylesheetBuilder()
+							.border("border", context -> new DLineBorder(0xFF888888, 1))
+							//.shadow("shadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()))
+							.build()), editor, new SimpleLiveInt(0)),
 					editor.isUpdated());
 			tabs.tabs.add(tab);
 			tabs.currentTab.setValue(tab);

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

@@ -6,7 +6,6 @@
 package org.openzen.zenscript.ide.ui.view.aspectbar;
 
 import java.util.function.Consumer;
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DDrawable;

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

@@ -8,7 +8,6 @@ package org.openzen.zenscript.ide.ui.view.aspectbar;
 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.DSizing;
 import org.openzen.drawablegui.DFontMetrics;
@@ -186,7 +185,6 @@ public class AspectBarView extends BaseComponentGroup {
 		if (surface != null) {
 			layout();
 			setupActiveBarText();
-			surface.repaint(bounds);
 		}
 	}
 
@@ -307,8 +305,6 @@ public class AspectBarView extends BaseComponentGroup {
 					style.backgroundColor,
 					style.windowControlShadow);
 		}
-		
-		surface.repaint(bounds);
 	}
 	
 	private void layoutAspectSelectorButtons() {
@@ -347,8 +343,6 @@ public class AspectBarView extends BaseComponentGroup {
 					new DIRectangle(x, bounds.y + y, width, height));
 			x += width;
 		}
-		
-		surface.repaint(bounds);
 	}
 
 	@Override

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

@@ -7,7 +7,6 @@ package org.openzen.zenscript.ide.ui.view.aspectbar;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;

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

@@ -8,7 +8,6 @@ package org.openzen.zenscript.ide.ui.view.editor;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DFont;
@@ -289,17 +288,9 @@ public class SourceEditor implements DComponent {
 	}
 	
 	private void setCursor(SourcePosition start, SourcePosition end) {
-		int previousLine = cursorEnd == null ? -1 : cursorEnd.line;
-		
 		cursorStart = start;
 		cursorEnd = end;
 		
-		if (previousLine != cursorEnd.line) {
-			if (previousLine >= 0)
-				repaintLine(previousLine);
-			repaintLine(cursorEnd.line);
-		}
-		
 		clearMultilineSelection();
 		
 		int x = bounds.x + lineBarWidth + style.lineBarMargin;
@@ -331,12 +322,10 @@ public class SourceEditor implements DComponent {
 				}
 				
 				int toX = getX(to);
-				multiLineSelection.add(surface.fillRect(z + 2, new DIRectangle(x, getY(to), toX - x, selectionLineHeight), style.selectionColor));
+				multiLineSelection.add(surface.fillRect(z + 2, new DIRectangle(x, getY(to), Math.max(0, toX - x), selectionLineHeight), style.selectionColor));
 				selection.setRectangle(DIRectangle.EMPTY);
 			}
 		} else {
-			if (cursorEnd != null)
-				
 			selection.setRectangle(DIRectangle.EMPTY);
 		}
 		
@@ -603,13 +592,6 @@ public class SourceEditor implements DComponent {
 		unchanged.setValue(false);
 	}
 	
-	private void repaintLine(int line) {
-		if (bounds == null)
-			return;
-		
-		surface.repaint(bounds.x, lineToY(line), bounds.width, selectionLineHeight);
-	}
-	
 	public void scrollTo(SourcePosition position) {
 		surface.getContext().scrollInView(getX(position), getY(position), 2, selectionLineHeight);
 	}
@@ -704,9 +686,6 @@ public class SourceEditor implements DComponent {
 	
 	private void onLinesUpdated() {
 		sizing.setValue(new DSizing(0, fullLineHeight * tokens.getLineCount()));
-		
-		if (bounds != null)
-			surface.repaint(bounds);
 	}
 	
 	private void layoutLines(int fromIndex) {
@@ -754,8 +733,6 @@ public class SourceEditor implements DComponent {
 
 		@Override
 		public void onLineChanged(int index) {
-			repaintLine(index);
-			
 			if (bounds != null) {
 				removeLineTokens(drawnTokens.get(index));
 				drawnTokens.get(index).clear();

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.zenscript.ide.ui.view.output;
 
-import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DSizing;