Added tabs + support for multiple open source files

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.style.DShadow;
 
 /**

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

@@ -5,7 +5,6 @@
  */
 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;
@@ -25,6 +24,10 @@ public interface DComponent extends Closeable {
 	
 	void paint(DCanvas canvas);
 	
+	default void onMounted() {}
+	
+	default void onUnmounted() {}
+	
 	default void onMouseEnter(DMouseEvent e) {}
 	
 	default void onMouseExit(DMouseEvent e) {}

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

@@ -5,7 +5,6 @@
  */
 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;

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

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

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

@@ -5,8 +5,6 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.listeners.DIRectangle;
-
 /**
  *
  * @author Hoofdgebruiker

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.listeners.DIRectangle;
 import java.io.Closeable;
 import java.util.ArrayList;
 import java.util.List;
@@ -49,9 +48,12 @@ public class DSideLayout extends BaseComponentGroup {
 			this.main.close();
 		
 		this.main = component;
-		main.setContext(path, context);
-		setBounds(bounds);
-		context.repaint(bounds);
+		
+		if (context != null && bounds != null) {
+			main.setContext(path, context);
+			setBounds(bounds);
+			context.repaint(bounds);
+		}
 	}
 
 	@Override

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

@@ -51,4 +51,20 @@ public final class DTransform2D {
 	public float getY(float x, float y) {
 		return x * yx + y * yy + dy;
 	}
+	
+	public DTransform2D mul(DTransform2D other) {
+		// [xx xy dx]   [xx xy dx]   [xx*xx+xy*yx xx*xy+xy*yy xx*dx+xy*dy+dx]
+		// [yx yy dy] x [yx yy dy] = [yx*xx+yy*yx yx*xy+yy*yy yx*dx+yy*dy+dy]
+		// [0  0  1 ]   [0  0  1 ]   [0           0           1             ]
+		DTransform2D a = this;
+		DTransform2D b = other;
+		return new DTransform2D(
+				a.xx * b.xx + a.xy * b.yx,
+				a.xx * b.xy + a.xy * b.yy,
+				a.yx * b.xx + a.yy * b.yx,
+				a.yx * b.xy + a.yx + b.xy,
+				a.xx * b.dx + a.xy * b.dy + dx,
+				a.yx * b.dx + a.yy * b.dy + dy
+		);
+	}
 }

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

@@ -5,7 +5,6 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.listeners.DIRectangle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.style.DStyleSheets;
 

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

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

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

@@ -13,7 +13,7 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DUIWindow;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.ImmutableLiveObject;
 import org.openzen.drawablegui.live.LiveBool;

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

@@ -6,7 +6,7 @@
 package org.openzen.drawablegui.border;
 
 import org.openzen.drawablegui.DCanvas;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 
 /**

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

@@ -7,7 +7,7 @@ package org.openzen.drawablegui.border;
 
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DUIContext;
 
 /**

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

@@ -9,7 +9,7 @@ import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DMouseEvent;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveInt;
 import org.openzen.drawablegui.live.LiveObject;

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

@@ -11,7 +11,7 @@ import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontMetrics;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
@@ -68,6 +68,16 @@ public class DScrollPane implements DComponent {
 			contentsHeight.setValue(newPreferences.preferredHeight);
 		});
 	}
+	
+	@Override
+	public void onMounted() {
+		contents.onMounted();
+	}
+	
+	@Override
+	public void onUnmounted() {
+		contents.onUnmounted();
+	}
 
 	@Override
 	public void setContext(DStylePath parent, DUIContext context) {

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

@@ -21,7 +21,7 @@ import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DPathBoundsCalculator;
 import org.openzen.drawablegui.DUIContext;
@@ -132,7 +132,7 @@ public class SwingCanvas implements DCanvas {
 		
 		GeneralPath jPath = context.getPath(path);
 		
-		BufferedImage image = new BufferedImage(bounds.width + 2 * offset, bounds.height + 2 * offset, BufferedImage.TYPE_INT_ARGB);
+		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);

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

@@ -20,7 +20,7 @@ import java.awt.event.MouseMotionListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DKeyEvent;
 import static org.openzen.drawablegui.DKeyEvent.KeyCode.*;
 import org.openzen.drawablegui.DMouseEvent;

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

@@ -15,7 +15,7 @@ import org.openzen.drawablegui.DDrawable;
 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.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;

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-close-24px.svg"; //args[0];
+		String filename = "baseline-build-24px.svg"; //args[0];
 		//String filename = "baseline-dashboard-24px.svg";
-		String className = "ColorableCloseIcon";
+		String className = "BuildIcon";
 		File file = new File(filename);
 		if (!file.exists()) {
 			System.out.println("No such file: " + filename);

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

@@ -5,73 +5,16 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-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;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
 
 /**
  *
  * @author Hoofdgebruiker
  */
 public class IDEAspectBar {
-	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) {
-		return listeners.add(listener);
-	}
-	
-	public void addToolbar(IDEAspectToolbar toolbar) {
-		int index = insertToolbar(toolbar);
-		listeners.accept(listener -> listener.onAspectBarAdded(index, toolbar));
-	}
-	
-	public boolean removeToolbar(IDEAspectToolbar toolbar) {
-		int index = aspectToolbars.indexOf(toolbar);
-		if (index < 0)
-			return false;
-		
-		aspectToolbars.remove(index);
-		listeners.accept(listener -> listener.onAspectBarRemoved(index, toolbar));
-		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) {
-				aspectToolbars.add(i, toolbar);
-				return i;
-			}
-		}
-		int index = aspectToolbars.size();
-		aspectToolbars.add(toolbar);
-		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);
-	}
+	public final LiveList<IDEAspectToolbar> toolbars = new LiveArrayList<>(); // TODO: only expose read-only variant
+	public final LiveObject<IDEAspectToolbar> active = new SimpleLiveObject<>(null);
 }

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

@@ -5,8 +5,8 @@
  */
 package org.openzen.zenscript.ide.ui;
 
-import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.listeners.ListenerList;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 
 /**
@@ -14,5 +14,17 @@ import org.openzen.zenscript.ide.host.IDESourceFile;
  * @author Hoofdgebruiker
  */
 public class IDEDockWindow {
-	public final LiveObject<IDESourceFile> currentSourceFile = new SimpleLiveObject<>(null);
+	private final ListenerList<Listener> listeners = new ListenerList<>();
+	
+	public ListenerHandle<Listener> addListener(Listener listener) {
+		return listeners.add(listener);
+	}
+	
+	public void open(IDESourceFile sourceFile) {
+		listeners.accept(listener -> listener.onOpen(sourceFile));
+	}
+	
+	public interface Listener {
+		void onOpen(IDESourceFile sourceFile);
+	}
 }

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

@@ -9,8 +9,11 @@ import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.icons.AddBoxIcon;
+import org.openzen.zenscript.ide.ui.icons.BuildIcon;
+import org.openzen.zenscript.ide.ui.icons.PlayIcon;
 import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
 import org.openzen.zenscript.ide.ui.icons.SettingsIcon;
+import org.openzen.zenscript.ide.ui.icons.ShadedProjectIcon;
 import org.openzen.zenscript.ide.ui.view.IconButtonControl;
 
 /**
@@ -22,6 +25,8 @@ public class IDEWindow {
 	public final IDEDockWindow dockWindow;
 	public final IDEStatusBar statusBar;
 	
+	public IDEAspectToolbar projectToolbar;
+	
 	public IDEWindow() {
 		aspectBar = new IDEAspectBar();
 		dockWindow = new IDEDockWindow();
@@ -37,13 +42,15 @@ public class IDEWindow {
 	}
 	
 	public void open(IDESourceFile sourceFile) {
-		dockWindow.currentSourceFile.setValue(sourceFile);
+		dockWindow.open(sourceFile);
 	}
 	
 	private void init() {
-		IDEAspectToolbar projectToolbar = new IDEAspectToolbar(0, ProjectIcon.GREY, "Project", "Project management");
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLACK, e -> {}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.BLACK, e -> {}));
-		aspectBar.addToolbar(projectToolbar);
+		projectToolbar = new IDEAspectToolbar(0, ShadedProjectIcon.PURPLE, "Project", "Project management");
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.ORANGE, e -> {}));
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.PURPLE, e -> {}));
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, BuildIcon.BLUE, e -> {}));
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, PlayIcon.GREEN, e -> {}));
+		aspectBar.toolbars.add(projectToolbar);
 	}
 }

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

@@ -8,10 +8,14 @@ import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.style.DShadow;
 
 public class AddBoxIcon implements DColorableIcon {
 	public static final AddBoxIcon INSTANCE = new AddBoxIcon();
 	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon BLUE = new ColoredIcon(INSTANCE, 0xFF1B1464);
+	public static final ColoredIcon GREEN = new ColoredIcon(INSTANCE, 0xFF006266);
+	public static final ColoredIcon ORANGE = new ColoredIcon(INSTANCE, 0xFFEE5A24);
 	
 	private AddBoxIcon() {}
 	
@@ -44,6 +48,7 @@ public class AddBoxIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.shadowPath(PATH, transform, new DShadow(0xFF999999, 0, 1, 6));
 		canvas.fillPath(PATH, transform, color);
 	}
 

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

@@ -0,0 +1,52 @@
+/*
+ * 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;
+import org.openzen.drawablegui.style.DShadow;
+
+public class BuildIcon implements DColorableIcon {
+	public static final BuildIcon INSTANCE = new BuildIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon BLUE = new ColoredIcon(INSTANCE, 0xFF0652DD);
+	
+	private BuildIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(22.7f, 19f);
+		tracer.lineTo(13.6f, 9.9f);
+		tracer.bezierCubic(14.5f, 7.5999994f, 14.0f, 4.8999996f, 12.1f, 2.9999995f);
+		tracer.bezierCubic(10.1f, 0.9999995f, 7.1000004f, 0.5999994f, 4.7000003f, 1.6999996f);
+		tracer.lineTo(9f, 6f);
+		tracer.lineTo(6f, 9f);
+		tracer.lineTo(1.6f, 4.7f);
+		tracer.bezierCubic(0.4f, 7.1f, 0.9f, 10.1f, 2.9f, 12.1f);
+		tracer.bezierCubic(4.8f, 14.0f, 7.5f, 14.5f, 9.8f, 13.6f);
+		tracer.lineTo(18.900002f, 22.7f);
+		tracer.bezierCubic(19.300001f, 23.1f, 19.900002f, 23.1f, 20.300001f, 22.7f);
+		tracer.lineTo(22.6f, 20.400002f);
+		tracer.bezierCubic(23.1f, 20.000002f, 23.1f, 19.300001f, 22.7f, 19.000002f);
+		tracer.close();
+	};
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
+		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/PlayIcon.java

@@ -0,0 +1,42 @@
+/*
+ * 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;
+import org.openzen.drawablegui.style.DShadow;
+
+public class PlayIcon implements DColorableIcon {
+	public static final PlayIcon INSTANCE = new PlayIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon GREEN = new ColoredIcon(INSTANCE, 0xFF009432);
+	
+	private PlayIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(8f, 5f);
+		tracer.lineTo(8.0f, 19.0f);
+		tracer.lineTo(19.0f, 12.0f);
+		tracer.close();
+	};
+	
+	@Override
+	public void draw(DCanvas canvas, DTransform2D transform, int color) {
+		canvas.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
+		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/SettingsIcon.java

@@ -13,6 +13,7 @@ import org.openzen.drawablegui.style.DShadow;
 public class SettingsIcon implements DColorableIcon {
 	public static final SettingsIcon INSTANCE = new SettingsIcon();
 	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon PURPLE = new ColoredIcon(INSTANCE, 0xFF5758BB);
 	
 	private SettingsIcon() {}
 	
@@ -67,7 +68,7 @@ public class SettingsIcon implements DColorableIcon {
 	
 	@Override
 	public void draw(DCanvas canvas, DTransform2D transform, int color) {
-		//canvas.shadowPath(PATH, transform, new DShadow(0xFF888888, 0, 1, 3.5f));
+		canvas.shadowPath(PATH, transform, new DShadow(0xFF888888, 0, 1, 4));
 		canvas.fillPath(PATH, transform, color);
 	}
 

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

@@ -0,0 +1,53 @@
+/*
+ * 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 ShadedCodeIcon implements DColorableIcon {
+	public static final ShadedCodeIcon INSTANCE = new ShadedCodeIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon BLUE = new ColoredIcon(INSTANCE, 0xFF1B1464);
+	
+	private ShadedCodeIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(9.4f, 16.6f);
+		tracer.lineTo(4.8f, 12f);
+		tracer.lineTo(9.4f, 7.4f);
+		tracer.lineTo(8f, 6f);
+		tracer.lineTo(2.0f, 12.0f);
+		tracer.lineTo(8.0f, 18.0f);
+		tracer.lineTo(9.4f, 16.6f);
+		tracer.close();
+		tracer.moveTo(14.599999f, 16.6f);
+		tracer.lineTo(19.199999f, 12.0f);
+		tracer.lineTo(14.599998f, 7.4f);
+		tracer.lineTo(16f, 6f);
+		tracer.lineTo(22.0f, 12.0f);
+		tracer.lineTo(16.0f, 18.0f);
+		tracer.lineTo(14.6f, 16.6f);
+		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/ShadedProjectIcon.java

@@ -0,0 +1,61 @@
+/*
+ * 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 ShadedProjectIcon implements DColorableIcon {
+	public static final ShadedProjectIcon INSTANCE = new ShadedProjectIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon PURPLE = new ColoredIcon(INSTANCE, 0xFF5758BB);
+	
+	private ShadedProjectIcon() {}
+	
+	private static final DPath PATH = tracer -> {
+		tracer.moveTo(3f, 13f);
+		tracer.lineTo(11.0f, 13.0f);
+		tracer.lineTo(11.0f, 3.0f);
+		tracer.lineTo(3.0f, 3.0f);
+		tracer.lineTo(3.0f, 13.0f);
+		tracer.close();
+		tracer.moveTo(3.0f, 21.0f);
+		tracer.lineTo(11.0f, 21.0f);
+		tracer.lineTo(11.0f, 15.0f);
+		tracer.lineTo(3.0f, 15.0f);
+		tracer.lineTo(3.0f, 21.0f);
+		tracer.close();
+		tracer.moveTo(13.0f, 21.0f);
+		tracer.lineTo(21.0f, 21.0f);
+		tracer.lineTo(21.0f, 11.0f);
+		tracer.lineTo(13.0f, 11.0f);
+		tracer.lineTo(13.0f, 21.0f);
+		tracer.close();
+		tracer.moveTo(13.0f, 3.0f);
+		tracer.lineTo(13.0f, 9.0f);
+		tracer.lineTo(21.0f, 9.0f);
+		tracer.lineTo(21.0f, 3.0f);
+		tracer.lineTo(13.0f, 3.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/ShadedSaveIcon.java

@@ -0,0 +1,61 @@
+/*
+ * 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;
+import org.openzen.drawablegui.style.DShadow;
+
+public class ShadedSaveIcon implements DColorableIcon {
+	public static final ShadedSaveIcon INSTANCE = new ShadedSaveIcon();
+	public static final ColoredIcon BLACK = new ColoredIcon(INSTANCE, 0xFF000000);
+	public static final ColoredIcon PURPLE = new ColoredIcon(INSTANCE, 0xFF5758BB);
+	
+	private ShadedSaveIcon() {}
+	
+	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.shadowPath(PATH, transform, new DShadow(0xFFCCCCCC, 0, 1, 4));
+		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/view/IconButtonControl.java

@@ -14,7 +14,7 @@ import org.openzen.drawablegui.DMouseEvent;
 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.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.ImmutableLiveBool;
 import org.openzen.drawablegui.live.LiveBool;

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

@@ -8,7 +8,7 @@ package org.openzen.zenscript.ide.ui.view;
 import org.openzen.drawablegui.DCanvas;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.DUIContext;

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

@@ -0,0 +1,197 @@
+/*
+ * 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 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.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.live.ImmutableLiveObject;
+import org.openzen.drawablegui.live.LiveArrayList;
+import org.openzen.drawablegui.live.LiveList;
+import org.openzen.drawablegui.live.LiveMappedList;
+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 TabbedView extends BaseComponentGroup {
+	private final DStyleClass styleClass;
+	public final LiveList<TabbedViewComponent> tabs = new LiveArrayList<>();
+	private final LiveObject<DDimensionPreferences> preferences = new ImmutableLiveObject<>(DDimensionPreferences.EMPTY);
+	public final LiveObject<TabbedViewComponent> currentTab = new SimpleLiveObject<>(null);
+	
+	private DUIContext context;
+	private DStylePath path;
+	private DIRectangle bounds;
+	private TabbedViewStyle style;
+	private int totalTabHeight;
+	private DFontMetrics fontMetrics;
+
+	private final LiveList<TabbedViewTab> tabComponents = new LiveMappedList<>(tabs, tab -> {
+		TabbedViewTab result = new TabbedViewTab(this, currentTab, tab);
+		if (context != null)
+			result.setContext(path, context);
+		return result;
+	});
+	
+	public TabbedView(DStyleClass styleClass) {
+		this.styleClass = styleClass;
+		tabs.addListener(new TabListListener());
+		
+		currentTab.addListener((oldValue, newValue) -> {
+			if (oldValue != null)
+				oldValue.content.onUnmounted();
+			if (newValue != null)
+				newValue.content.onMounted();
+			
+			if (newValue != null && bounds != null) {
+				DIRectangle contentBounds = new DIRectangle(
+					bounds.x, bounds.y + totalTabHeight,
+					bounds.width, bounds.height - totalTabHeight);
+				newValue.content.setBounds(contentBounds);
+			}
+		});
+	}
+	
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		path = parent.getChild("tabbedView", styleClass);
+		style = new TabbedViewStyle(context.getStylesheets().get(context, path));
+		fontMetrics = context.getFontMetrics(style.tabFont);
+		totalTabHeight = style.paddingTop + style.paddingBottom + fontMetrics.getAscent() + fontMetrics.getDescent();
+		
+		for (TabbedViewComponent tab : tabs)
+			prepare(tab);
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+		
+		if (currentTab.getValue() == null)
+			return;
+		
+		DIRectangle contentBounds = new DIRectangle(
+				bounds.x, bounds.y + totalTabHeight,
+				bounds.width, bounds.height - totalTabHeight);
+		currentTab.getValue().content.setBounds(contentBounds);
+		layoutTabs();
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		for (DComponent component : tabComponents)
+			component.paint(canvas);
+		
+		if (currentTab.getValue() != null)
+			currentTab.getValue().content.paint(canvas);
+	}
+
+	@Override
+	public void close() {
+		
+	}
+	
+	private void repaintTabs() {
+		if (context == null)
+			return;
+		
+		context.repaint(bounds.x, bounds.y, bounds.width, totalTabHeight);
+	}
+	
+	private void prepare(TabbedViewComponent tab) {
+		tab.content.setContext(path, context);
+	}
+	
+	private void layoutTabs() {
+		if (bounds == null)
+			return;
+		
+		int x = bounds.x + style.tabBarSpacingLeft;
+		for (DComponent tab : tabComponents) {
+			DDimensionPreferences preferences = tab.getDimensionPreferences().getValue();
+			tab.setBounds(new DIRectangle(
+					x, bounds.y + totalTabHeight - preferences.preferredHeight, preferences.preferredWidth, preferences.preferredHeight));
+			
+			x += preferences.preferredWidth + style.tabSpacing;
+		}
+		
+		repaintTabs();
+	}
+
+	@Override
+	protected void forEachChild(Consumer<DComponent> children) {
+		if (currentTab.getValue() != null)
+			children.accept(currentTab.getValue().content);
+		
+		for (TabbedViewTab component : tabComponents)
+			children.accept(component.closeButton);
+		for (TabbedViewTab component : tabComponents)
+			children.accept(component);
+	}
+
+	@Override
+	protected DComponent findChild(Predicate<DComponent> predicate) {
+		if (currentTab.getValue() != null && predicate.test(currentTab.getValue().content))
+			return currentTab.getValue().content;
+		
+		for (TabbedViewTab component : tabComponents)
+			if (predicate.test(component.closeButton))
+				return component.closeButton;
+		for (TabbedViewTab component : tabComponents)
+			if (predicate.test(component))
+				return component;
+		
+		return null;
+	}
+	
+	private class TabListListener implements LiveList.Listener<TabbedViewComponent> {
+		@Override
+		public void onInserted(int index, TabbedViewComponent value) {
+			if (currentTab.getValue() == null)
+				currentTab.setValue(value);
+			
+			prepare(value);
+			layoutTabs();
+		}
+
+		@Override
+		public void onChanged(int index, TabbedViewComponent oldValue, TabbedViewComponent newValue) {
+			repaintTabs();
+		}
+
+		@Override
+		public void onRemoved(int index, TabbedViewComponent oldValue) {
+			if (oldValue == currentTab.getValue())
+				currentTab.setValue(tabs.size() == 0 ? null : tabs.get(Math.max(index - 1, 0)));
+			
+			layoutTabs();
+		}
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewComponent.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.zenscript.ide.ui.view;
+
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DDrawable;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TabbedViewComponent {
+	public final String title;
+	public final DDrawable icon;
+	public final DComponent content;
+	
+	public TabbedViewComponent(String title, DDrawable icon, DComponent content) {
+		this.title = title;
+		this.icon = icon;
+		this.content = content;
+	}
+}

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

@@ -0,0 +1,60 @@
+/*
+ * 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 org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DFontFamily;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DPxDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TabbedViewStyle {
+	public final int backgroundColor;
+	public final DFont tabFont;
+	public final int tabFontColor;
+	
+	public final int tabColorNormal;
+	public final int tabColorHover;
+	public final int tabColorPress;
+	public final int tabColorActive;
+	
+	public final int paddingTop;
+	public final int paddingBottom;
+	public final int paddingLeft;
+	public final int paddingRight;
+	public final int tabBarSpacingLeft;
+	public final int tabBarSpacingRight;
+	public final int tabSpacing;
+	
+	public final int borderColor;
+	public final int borderWidth;
+	
+	public TabbedViewStyle(DStyleDefinition style) {
+		backgroundColor = style.getColor("backgroundColor", 0xFFEEEEEE);
+		tabFont = style.getFont("tabFont", context -> new DFont(DFontFamily.CODE, false, false, false, (int)(12 * context.getScale())));
+		tabFontColor = style.getColor("tabFontColor", 0xFF000000);
+		
+		tabColorNormal = style.getColor("tabColorNormal", 0xFFEEEEEE);
+		tabColorHover = style.getColor("tabColorHover", 0xFFFFFFFF);
+		tabColorPress = style.getColor("tabColorPress", 0xFFF0F0F0);
+		tabColorActive = style.getColor("tabColorActive", 0xFFFFFFFF);
+		
+		paddingTop = style.getDimension("paddingTop", new DDpDimension(4));
+		paddingBottom = style.getDimension("paddingTop", new DDpDimension(4));
+		paddingLeft = style.getDimension("paddingLeft", new DDpDimension(4));
+		paddingRight = style.getDimension("paddingRight", new DDpDimension(4));
+		tabBarSpacingLeft = style.getDimension("tabBarSpacingLeft", new DDpDimension(4));
+		tabBarSpacingRight = style.getDimension("tabBarSpacingRight", new DDpDimension(4));
+		tabSpacing = style.getDimension("tabSpacing", new DDpDimension(4));
+		
+		borderColor = style.getColor("borderColor", 0xFF888888);
+		borderWidth = style.getDimension("borderWidth", new DPxDimension(1));
+	}
+}

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

@@ -0,0 +1,153 @@
+/*
+ * 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 org.openzen.drawablegui.DCanvas;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DFontMetrics;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DPath;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+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 TabbedViewTab implements DComponent {
+	private final TabbedViewComponent tab;
+	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	private final LiveObject<TabbedViewComponent> currentTab;
+	
+	private final TabbedView parent;
+	public final TabbedViewTabClose closeButton;
+	
+	private DUIContext context;
+	private TabbedViewTabStyle style;
+	private DFontMetrics fontMetrics;
+	private int textWidth;
+	private DIRectangle bounds;
+	
+	private boolean hover;
+	private boolean press;
+	
+	public TabbedViewTab(TabbedView parent, LiveObject<TabbedViewComponent> currentTab, TabbedViewComponent tab) {
+		this.parent = parent;
+		this.currentTab = currentTab;
+		this.tab = tab;
+		this.closeButton = new TabbedViewTabClose(this);
+	}
+	
+	public void closeTab() {
+		parent.tabs.remove(tab);
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		DStylePath path = parent.getChild("tab", DStyleClass.EMPTY);
+		style = new TabbedViewTabStyle(context.getStylesheets().get(context, path));
+		fontMetrics = context.getFontMetrics(style.tabFont);
+		closeButton.setContext(path, context);
+		
+		textWidth = fontMetrics.getWidth(tab.title);
+		preferences.setValue(new DDimensionPreferences(
+				style.paddingLeft + textWidth + style.paddingRight
+						+ style.closeIconPadding
+						+ closeButton.getDimensionPreferences().getValue().preferredWidth,
+				style.paddingTop + fontMetrics.getAscent() + fontMetrics.getDescent()
+						+ style.paddingBottom));
+	}
+
+	@Override
+	public LiveObject<DDimensionPreferences> getDimensionPreferences() {
+		return preferences;
+	}
+
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+		
+		DDimensionPreferences close = closeButton.getDimensionPreferences().getValue();
+		closeButton.setBounds(new DIRectangle(
+				bounds.x + bounds.width - close.preferredWidth - style.paddingRight,
+				bounds.y + (bounds.height - close.preferredHeight) / 2,
+				close.preferredWidth,
+				close.preferredHeight));
+	}
+
+	@Override
+	public void paint(DCanvas canvas) {
+		int width = style.paddingLeft + textWidth + style.paddingRight
+				+ closeButton.getDimensionPreferences().getValue().preferredWidth + style.closeIconPadding;
+
+		int color = style.tabColorNormal;
+		if (currentTab.getValue() == tab)
+			color = style.tabColorActive;
+		else if (press)
+			color = style.tabColorPress;
+		else if (hover)
+			color = style.tabColorHover;
+
+		canvas.fillRectangle(bounds.x, bounds.y, width, bounds.height, color);
+		canvas.strokePath(DPath.rectangle(bounds.x, bounds.y, width, bounds.height), DTransform2D.IDENTITY, style.borderColor, style.borderWidth);
+
+		canvas.drawText(style.tabFont, style.tabFontColor, bounds.x + style.paddingLeft, bounds.y + style.paddingTop + fontMetrics.getAscent(), tab.title);
+		
+		closeButton.paint(canvas);
+	}
+
+	@Override
+	public void close() {
+		
+	}
+	
+	@Override
+	public void onMouseEnter(DMouseEvent e) {
+		hover = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseExit(DMouseEvent e) {
+		hover = false;
+		press = false;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseDown(DMouseEvent e) {
+		press = true;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseRelease(DMouseEvent e) {
+		press = false;
+		repaint();
+	}
+	
+	@Override
+	public void onMouseClick(DMouseEvent e) {
+		currentTab.setValue(tab);
+	}
+	
+	private void repaint() {
+		if (context != null && bounds != null)
+			context.repaint(bounds);
+	}
+}

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

@@ -0,0 +1,102 @@
+/*
+ * 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 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.DIRectangle;
+import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DTransform2D;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+import org.openzen.zenscript.ide.ui.icons.ColoredIcon;
+import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TabbedViewTabClose implements DComponent {
+	private final TabbedViewTab tab;
+	private final LiveObject<DDimensionPreferences> preferences = new SimpleLiveObject<>(DDimensionPreferences.EMPTY);
+	
+	private DUIContext context;
+	private DIRectangle bounds;
+	private TabbedViewTabCloseStyle style;
+	private DColorableIcon icon;
+	
+	private boolean hover;
+	private boolean press;
+	
+	public TabbedViewTabClose(TabbedViewTab tab) {
+		this.tab = tab;
+	}
+
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		
+		DStylePath path = parent.getChild("tabClose", DStyleClass.EMPTY);
+		style = new TabbedViewTabCloseStyle(context.getStylesheets().get(context, path));
+		preferences.setValue(new DDimensionPreferences(style.size, style.size));
+		icon = new ScalableCloseIcon(style.size / 24);
+	}
+
+	@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, 0xFFE81123);
+		}
+		
+		icon.draw(canvas, DTransform2D.translate(
+				bounds.x + (bounds.width - icon.getNominalWidth()) / 2,
+				bounds.y + (bounds.height - icon.getNominalHeight()) / 2),
+				hover ? 0xFFFFFFFF : 0xFF000000);
+	}
+
+	@Override
+	public void close() {
+		
+	}
+	
+	@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) {
+		tab.closeTab();
+	}
+}

IDE/src/main/java/org/openzen/zenscript/ide/ui/view/TabbedViewTabCloseStyle.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.zenscript.ide.ui.view;
+
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TabbedViewTabCloseStyle {
+	public final int size;
+	
+	public TabbedViewTabCloseStyle(DStyleDefinition style) {
+		size = style.getDimension("size", new DDpDimension(16));
+	}
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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 org.openzen.drawablegui.DFont;
+import org.openzen.drawablegui.DFontFamily;
+import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DPxDimension;
+import org.openzen.drawablegui.style.DStyleDefinition;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class TabbedViewTabStyle {
+	public final DFont tabFont;
+	public final int tabFontColor;
+	
+	public final int tabColorNormal;
+	public final int tabColorHover;
+	public final int tabColorPress;
+	public final int tabColorActive;
+	
+	public final int paddingTop;
+	public final int paddingBottom;
+	public final int paddingLeft;
+	public final int paddingRight;
+	
+	public final int borderColor;
+	public final int borderWidth;
+	
+	public final int closeIconSize;
+	public final int closeIconPadding;
+	
+	public TabbedViewTabStyle(DStyleDefinition style) {
+		tabFont = style.getFont("tabFont", context -> new DFont(DFontFamily.CODE, false, false, false, (int)(12 * context.getScale())));
+		tabFontColor = style.getColor("tabFontColor", 0xFF000000);
+		
+		tabColorNormal = style.getColor("tabColorNormal", 0xFFEEEEEE);
+		tabColorHover = style.getColor("tabColorHover", 0xFFFFFFFF);
+		tabColorPress = style.getColor("tabColorPress", 0xFFF0F0F0);
+		tabColorActive = style.getColor("tabColorActive", 0xFFFFFFFF);
+		
+		paddingTop = style.getDimension("paddingTop", new DDpDimension(4));
+		paddingBottom = style.getDimension("paddingTop", new DDpDimension(4));
+		paddingLeft = style.getDimension("paddingLeft", new DDpDimension(4));
+		paddingRight = style.getDimension("paddingRight", new DDpDimension(4));
+		
+		borderColor = style.getColor("borderColor", 0xFF888888);
+		borderWidth = style.getDimension("borderWidth", new DPxDimension(1));
+		
+		closeIconSize = style.getDimension("closeIconSize", new DDpDimension(16));
+		closeIconPadding = style.getDimension("closeIconPadding", new DDpDimension(6));
+	}
+}

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

@@ -5,14 +5,19 @@
  */
 package org.openzen.zenscript.ide.ui.view;
 
+import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DDimensionPreferences;
+import org.openzen.drawablegui.DDrawable;
 import org.openzen.drawablegui.DEmptyView;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.DSideLayout;
+import org.openzen.drawablegui.live.LiveList;
 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.host.IDESourceFile;
+import org.openzen.zenscript.ide.ui.IDEDockWindow;
 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;
@@ -23,21 +28,32 @@ import org.openzen.zenscript.ide.ui.view.project.RootTreeNode;
  * @author Hoofdgebruiker
  */
 public final class WindowView extends DSideLayout {
+	private final IDEWindow window;
+	private final TabbedView tabs;
+	
 	public WindowView(IDEWindow window, DevelopmentHost host) {
 		super(DStyleClass.EMPTY, DEmptyView.INSTANCE);
+		this.window = window;
 		
 		DTreeView projectView = new DTreeView(DTreeViewStyle.DEFAULT, new RootTreeNode(window, host), false);
 		projectView.getDimensionPreferences().setValue(new DDimensionPreferences(500, 500));
+		setMain(tabs = new TabbedView(DStyleClass.EMPTY));
 		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(DStyleClass.EMPTY, new SourceEditor(DStyleClass.EMPTY, window, newSource)));
-			}
-		});
+		window.dockWindow.addListener(new DockWindowListener());
+	}
+	
+	private class DockWindowListener implements IDEDockWindow.Listener {
+		@Override
+		public void onOpen(IDESourceFile sourceFile) {
+			TabbedViewComponent tab = new TabbedViewComponent(
+					sourceFile.getName(),
+					null,
+					new DScrollPane(DStyleClass.EMPTY, new SourceEditor(DStyleClass.EMPTY, window, sourceFile)));
+			tabs.tabs.add(tab);
+			tabs.currentTab.setValue(tab);
+		}
 	}
 }

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

@@ -14,7 +14,7 @@ import org.openzen.drawablegui.DMouseEvent;
 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.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
@@ -37,7 +37,7 @@ public class AspectBarSelectorButton implements DComponent {
 	private final Consumer<DMouseEvent> onClick;
 	private DUIContext context;
 	private AspectBarSelectorButtonStyle style;
-	private DIRectangle bounds;
+	private DIRectangle bounds = DIRectangle.EMPTY;
 	private DPath shape;
 	private boolean hovering;
 	private boolean pressing;
@@ -141,11 +141,11 @@ public class AspectBarSelectorButton implements DComponent {
 
 	@Override
 	public void close() {
-		// nothing
+		activeListener.close();
 	}
 	
 	private void repaint() {
-		if (context != null)
+		if (context != null && bounds != null)
 			context.repaint(bounds);
 	}
 }

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

@@ -16,7 +16,7 @@ import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.zenscript.ide.ui.IDEAspectBar;
@@ -28,11 +28,9 @@ import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.drawablegui.live.LivePredicateBool;
-import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
 import org.openzen.zenscript.ide.ui.IDEAspectBarControl;
-import org.openzen.zenscript.ide.ui.icons.CloseIcon;
 import org.openzen.zenscript.ide.ui.icons.ScalableCloseIcon;
 import org.openzen.zenscript.ide.ui.icons.ScalableMaximizeIcon;
 import org.openzen.zenscript.ide.ui.icons.ScalableMinimizeIcon;
@@ -55,7 +53,6 @@ public class AspectBarView extends BaseComponentGroup {
 	private boolean showWindowControls;
 	
 	private final LiveMappedList<IDEAspectToolbar, AspectBarSelectorButton> selectorButtons;
-	public final LiveObject<IDEAspectToolbar> active = new SimpleLiveObject<>(null);
 	private LiveMappedList<IDEAspectBarControl, DComponent> activeToolbarComponents;
 	
 	private final ListenerHandle<LiveList.Listener<IDEAspectToolbar>> listener;
@@ -75,8 +72,8 @@ public class AspectBarView extends BaseComponentGroup {
 		this.styleClass = styleClass;
 		this.aspectBar = aspectBar;
 		
-		active.addListener(this::onActiveChanged);
-		listener = aspectBar.aspectToolbars.addListener(new ToolbarListListener());
+		aspectBar.active.addListener(this::onActiveChanged);
+		listener = aspectBar.toolbars.addListener(new ToolbarListListener());
 		
 		minimize = new WindowActionButton(scale -> new ScalableMinimizeIcon(scale), e -> context.getWindow().minimize());
 		minimizeRelayout = minimize.getDimensionPreferences().addListener((a, b) -> layout());
@@ -91,18 +88,19 @@ public class AspectBarView extends BaseComponentGroup {
 		closeRelayout = close.getDimensionPreferences().addListener((a, b) -> layout());
 		
 		selectorButtons = new LiveMappedList<>(
-				aspectBar.aspectToolbars,
+				aspectBar.toolbars,
 				bar -> {
-					LiveBool buttonActive = new LivePredicateBool<>(active, activeBar -> activeBar == bar);
-					AspectBarSelectorButton button = new AspectBarSelectorButton(DStyleClass.EMPTY, bar.icon, buttonActive, e -> active.setValue(bar));
+					LiveBool buttonActive = new LivePredicateBool<>(aspectBar.active, activeBar -> activeBar == bar);
+					AspectBarSelectorButton button = new AspectBarSelectorButton(DStyleClass.EMPTY, bar.icon, buttonActive, e -> aspectBar.active.setValue(bar));
 					if (context != null)
 						button.setContext(path, context);
 					
 					return button;
 				});
+		selectorButtons.addListener(new SelectorButtonListListener());
 		
-		if (aspectBar.aspectToolbars.size() > 0)
-			active.setValue(aspectBar.aspectToolbars.get(0));
+		if (aspectBar.toolbars.size() > 0)
+			aspectBar.active.setValue(aspectBar.toolbars.get(0));
 	}
 	
 	@Override
@@ -118,7 +116,7 @@ public class AspectBarView extends BaseComponentGroup {
 		
 		if (bounds != null) {
 			layout();
-			active.setValue(active.getValue());
+			aspectBar.active.setValue(aspectBar.active.getValue());
 		}
 		
 		if (activeToolbarComponents != null)
@@ -155,8 +153,12 @@ public class AspectBarView extends BaseComponentGroup {
 		canvas.pushBounds(bounds);
 		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
 		
-		for (DComponent button : selectorButtons)
+		for (DComponent button : selectorButtons) {
+			if (button.getBounds() == null)
+				continue;
+			
 			button.paint(canvas);
+		}
 		
 		canvas.shadowPath(
 				aspectBarShape,
@@ -167,15 +169,15 @@ public class AspectBarView extends BaseComponentGroup {
 				DTransform2D.IDENTITY,
 				style.foregroundColor);
 		
-		if (active.getValue() != null) {
+		if (aspectBar.active.getValue() != null) {
 			int y = bounds.y
 					+ style.aspectBarPaddingTop
 					+ (int)(activeToolbarTitleFontMetrics.getAscent() * 0.35f)
 					+ (bounds.height - style.aspectBarPaddingTop) / 2;
 			int x = aspectSelectorEndX + style.aspectSelectorToToolbarSpacing;
-			canvas.drawText(style.activeToolbarTitleFont, style.activeToolbarTitleColor, x, y, active.getValue().title);
+			canvas.drawText(style.activeToolbarTitleFont, style.activeToolbarTitleColor, x, y, aspectBar.active.getValue().title);
 			canvas.fillRectangle(
-					x + activeToolbarTitleFontMetrics.getWidth(active.getValue().title) + 8,
+					x + activeToolbarTitleFontMetrics.getWidth(aspectBar.active.getValue().title) + 8,
 					bounds.y + style.aspectBarPaddingTop + 8,
 					2,
 					bounds.height - style.aspectBarPaddingTop - 16,
@@ -236,6 +238,7 @@ public class AspectBarView extends BaseComponentGroup {
 		minimize.setBounds(new DIRectangle(x, bounds.y, minimizeSize.preferredWidth, minimizeSize.preferredHeight));
 		
 		calculateAspectBarShape();
+		context.repaint(bounds);
 	}
 	
 	private void layoutAspectSelectorButtons() {
@@ -262,7 +265,7 @@ public class AspectBarView extends BaseComponentGroup {
 		
 		int x = aspectSelectorEndX
 				+ style.aspectSelectorToToolbarSpacing
-				+ activeToolbarTitleFontMetrics.getWidth(active.getValue().title)
+				+ activeToolbarTitleFontMetrics.getWidth(aspectBar.active.getValue().title)
 				+ style.toolbarTitleToControlsSpacing;
 		
 		int y = style.aspectBarPaddingTop + style.controlPaddingTop;
@@ -363,24 +366,35 @@ public class AspectBarView extends BaseComponentGroup {
 		@Override
 		public void onInserted(int index, IDEAspectToolbar value) {
 			if (index == 0 && activeToolbarComponents == null)
-				active.setValue(value);
-			
-			layout();
+				aspectBar.active.setValue(value);
 		}
 
 		@Override
 		public void onChanged(int index, IDEAspectToolbar oldValue, IDEAspectToolbar newValue) {
-			if (oldValue == active.getValue())
-				active.setValue(newValue);
-			
-			layoutAspectSelectorButtons();
+			if (oldValue == aspectBar.active.getValue())
+				aspectBar.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));
-			
+			if (oldValue == aspectBar.active.getValue())
+				aspectBar.active.setValue(aspectBar.toolbars.size() == 0 ? null : aspectBar.toolbars.get(0));
+		}
+	}
+	
+	private class SelectorButtonListListener implements LiveList.Listener<AspectBarSelectorButton> {
+		@Override
+		public void onInserted(int index, AspectBarSelectorButton value) {
+			layout();
+		}
+
+		@Override
+		public void onChanged(int index, AspectBarSelectorButton oldValue, AspectBarSelectorButton newValue) {
+			layoutAspectSelectorButtons();
+		}
+
+		@Override
+		public void onRemoved(int index, AspectBarSelectorButton oldValue) {
 			layout();
 		}
 	}

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

@@ -14,7 +14,7 @@ import org.openzen.drawablegui.DDimensionPreferences;
 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.DIRectangle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;

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

@@ -12,9 +12,10 @@ import org.openzen.drawablegui.DDimensionPreferences;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DFontMetrics;
-import org.openzen.drawablegui.listeners.DIRectangle;
+import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DKeyEvent;
 import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
@@ -22,7 +23,6 @@ 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.CodeIcon;
 import org.openzen.zenscript.lexer.ReaderCharReader;
 import org.openzen.zenscript.lexer.TokenParser;
 import org.openzen.zenscript.lexer.ZSToken;
@@ -33,6 +33,8 @@ import org.openzen.drawablegui.live.SimpleLiveBool;
 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.icons.ShadedCodeIcon;
+import org.openzen.zenscript.ide.ui.icons.ShadedSaveIcon;
 import org.openzen.zenscript.ide.ui.view.IconButtonControl;
 
 /**
@@ -52,6 +54,7 @@ public class SourceEditor implements DComponent {
 	private DIRectangle bounds;
 	private DUIContext context;
 	private SourceEditorStyle style;
+	private DTimerHandle blinkTimer;
 	
 	private DFontMetrics fontMetrics;
 	private int textLineHeight;
@@ -69,7 +72,7 @@ public class SourceEditor implements DComponent {
 	private boolean dragging = false;
 	
 	private final IDEWindow window;
-	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, CodeIcon.GREY, "Edit", "Source code editor");
+	private final IDEAspectToolbar editToolbar = new IDEAspectToolbar(0, ShadedCodeIcon.BLUE, "Edit", "Source code editor");
 	
 	public SourceEditor(DStyleClass styleClass, IDEWindow window, IDESourceFile sourceFile) {
 		this.styleClass = styleClass;
@@ -79,8 +82,7 @@ public class SourceEditor implements DComponent {
 		tokens = new TokenModel(sourceFile.getName(), tab.length());
 		tokenListener = tokens.addListener(new TokenListener());
 		
-		editToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SaveIcon.BLACK, SaveIcon.GREY, unchanged, e -> save()));
-		window.aspectBar.addToolbar(editToolbar);
+		editToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, ShadedSaveIcon.PURPLE, SaveIcon.GREY, unchanged, e -> save()));
 		
 		try {
 			TokenParser<ZSToken, ZSTokenType> parser = ZSTokenParser.createRaw(
@@ -93,9 +95,22 @@ public class SourceEditor implements DComponent {
 		}
 	}
 	
+	@Override
+	public void onMounted() {
+		window.aspectBar.toolbars.add(editToolbar);
+		window.aspectBar.active.setValue(editToolbar);
+	}
+	
+	@Override
+	public void onUnmounted() {
+		window.aspectBar.toolbars.remove(editToolbar);
+	}
+	
 	@Override
 	public void close() {
-		window.aspectBar.removeToolbar(editToolbar);
+		if (blinkTimer != null)
+			blinkTimer.close();
+		
 		tokenListener.close();
 	}
 
@@ -110,7 +125,10 @@ public class SourceEditor implements DComponent {
 		selectionLineHeight = textLineHeight + style.selectionPaddingTop + style.selectionPaddingBottom;
 		
 		dimensionPreferences.setValue(new DDimensionPreferences(0, fullLineHeight * tokens.getLineCount()));
-		context.setTimer(300, this::blink);
+		
+		if (blinkTimer != null)
+			blinkTimer.close();
+		blinkTimer = context.setTimer(300, this::blink);
 	}
 
 	@Override
@@ -217,9 +235,12 @@ public class SourceEditor implements DComponent {
 		if (e.isDoubleClick()) {
 			// select entire word
 			TokenModel.Position tokenPosition = tokens.getPosition(position.line, position.offset);
-			setCursor(
-					new SourcePosition(tokens, position.line, position.offset - tokenPosition.offset),
-					new SourcePosition(tokens, position.line, position.offset - tokenPosition.offset + tokens.getTokenAt(tokenPosition).content.length()));
+			ZSToken token = tokens.getTokenAt(tokenPosition);
+			if (token != null) {
+				setCursor(
+						new SourcePosition(tokens, position.line, position.offset - tokenPosition.offset),
+						new SourcePosition(tokens, position.line, position.offset - tokenPosition.offset + token.content.length()));
+			}
 		} else if (e.isTripleClick()) {
 			setCursor(
 					new SourcePosition(tokens, position.line, 0),
@@ -400,6 +421,9 @@ public class SourceEditor implements DComponent {
 	}
 	
 	private void delete() {
+		if (deleteSelection())
+			return;
+		
 		TokenLine line = tokens.getLine(cursorEnd.line);
 		if (cursorEnd.offset == line.length()) {
 			// merge 2 lines

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

@@ -56,8 +56,7 @@ public final class TokenLine {
 	}
 
 	public void add(ZSToken token) {
-		tokens.add(token);
-		length += token.content.length();
+		insert(tokens.size(), token);
 	}
 
 	public void addAll(Iterable<ZSToken> tokens) {
@@ -66,9 +65,33 @@ public final class TokenLine {
 		}
 	}
 
-	public void insert(int index, ZSToken token) {
+	public int insert(int index, ZSToken token) {
+		if (token.type != ZSTokenType.T_WHITESPACE_TAB && token.content.indexOf('\t') >= 0) {
+			int start = 0;
+			int tokens = 0;
+			for (int i = 0; i < token.content.length(); i++) {
+				if (token.content.charAt(i) == '\t') {
+					if (i > start) {
+						insert(index++, new ZSToken(token.type, token.content.substring(start, i)));
+						tokens++;
+					}
+					insert(index++, ZSTokenType.T_WHITESPACE_TAB.flyweight);
+					tokens++;
+					start = i + 1;
+				}
+			}
+			
+			if (start < token.content.length()) {
+				insert(index++, new ZSToken(token.type, token.content.substring(start)));
+				tokens++;
+			}
+			
+			return tokens;
+		}
+		
 		tokens.add(index, token);
 		length += token.content.length();
+		return 1;
 	}
 
 	public void replace(int index, ZSToken token) {

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

@@ -273,8 +273,7 @@ public class TokenModel {
 					if (!parts[0].isEmpty())
 						currentLine.add(new ZSToken(token.type, parts[0]));
 					if (!parts[parts.length - 1].isEmpty()) {
-						newLine.insert(0, new ZSToken(token.type, parts[parts.length - 1]));
-						tokenIndex++;
+						tokenIndex += newLine.insert(0, new ZSToken(token.type, parts[parts.length - 1]));
 					}
 					
 					for (int i = 1; i < parts.length - 1; i++) {

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

@@ -6,6 +6,7 @@
 package org.openzen.zenscript.ide.ui.view.project;
 
 import org.openzen.drawablegui.DColorableIcon;
+import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.live.LiveList;
 import org.openzen.drawablegui.live.LiveMappedList;
 import org.openzen.zenscript.ide.host.DevelopmentHost;
@@ -17,10 +18,12 @@ import org.openzen.zenscript.ide.ui.icons.ProjectIcon;
  * @author Hoofdgebruiker
  */
 public class ProjectTreeNode extends ProjectOverviewNode {
+	private final IDEWindow window;
 	private final DevelopmentHost host;
 	private final LiveList<ProjectOverviewNode> modules;
 	
 	public ProjectTreeNode(IDEWindow window, DevelopmentHost host) {
+		this.window = window;
 		this.host = host;
 		
 		modules = new LiveMappedList<>(host.getModules(), module -> new ModuleTreeNode(window, module));
@@ -50,4 +53,9 @@ public class ProjectTreeNode extends ProjectOverviewNode {
 	public boolean isLeaf() {
 		return false;
 	}
+	
+	@Override
+	public void onMouseClick(DMouseEvent e) {
+		window.aspectBar.active.setValue(window.projectToolbar);
+	}
 }

Parser/src/main/java/org/openzen/zenscript/lexer/ZSTokenType.java

@@ -11,7 +11,7 @@ package org.openzen.zenscript.lexer;
  */
 public enum ZSTokenType implements TokenType {
 	T_COMMENT_SCRIPT("#[^\n]*[\n\\e]", true),
-	T_COMMENT_SINGLELINE("//[^\n]*[\n\\e]", true),
+	T_COMMENT_SINGLELINE("//[^\n]*", true),
 	T_COMMENT_MULTILINE("/\\*([^\\*]|(\\*+([^\\*/])))*\\*+/", true, true),
 	T_WHITESPACE_SPACE(true, " ", " "),
 	T_WHITESPACE_TAB(true, "\t", "\t"),