Added tooltips to the toolbars.

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

@@ -5,10 +5,8 @@
  */
 package org.openzen.drawablegui;
 
-import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.style.DStyleClass;
-import org.openzen.drawablegui.style.DStylePath;
 
 /**
  *
@@ -17,31 +15,22 @@ import org.openzen.drawablegui.style.DStylePath;
 public class DSimpleTooltip {
 	private final DStyleClass styleClass;
 	private final LiveString tooltip;
-	private final ListenerHandle<LiveString.Listener> tooltipListener;
 	
 	private DUIContext context;
-	private DIRectangle bounds;
-	private DFontMetrics fontMetrics;
-	private DTooltipStyle style;
-	private boolean visible = false;
+	private DSimpleTooltipStyle style;
 	private DTimerHandle timerHandle = null;
 	
+	private int enterMouseX;
+	private int enterMouseY;
+	private DUIWindow window;
+	
 	public DSimpleTooltip(DStyleClass styleClass, LiveString tooltip) {
 		this.styleClass = styleClass;
 		this.tooltip = tooltip;
-		tooltipListener = tooltip.addListener(this::onTooltipChanged);
 	}
 	
-	private void onTooltipChanged(String oldValue, String newValue) {
-		if (context == null || bounds == null)
-			return;
-		
-		bounds = new DIRectangle(
-				bounds.x,
-				bounds.y,
-				style.border.getPaddingLeft() + fontMetrics.getWidth(tooltip.getValue()) + style.border.getPaddingRight(),
-				style.border.getPaddingTop() + fontMetrics.getAscent() + fontMetrics.getDescent() + style.border.getPaddingBottom());
-		context.repaint(bounds);
+	public void setContext(DUIContext context) {
+		this.context = context;
 	}
 	
 	public void onTargetMouseEnter(DMouseEvent e) {
@@ -49,11 +38,13 @@ public class DSimpleTooltip {
 			timerHandle.close();
 		
 		timerHandle = context.setTimer(1000, this::show);
-		bounds = new DIRectangle(
-				e.x,
-				e.y,
-				style.border.getPaddingLeft() + fontMetrics.getWidth(tooltip.getValue()) + style.border.getPaddingRight(),
-				style.border.getPaddingTop() + fontMetrics.getAscent() + fontMetrics.getDescent() + style.border.getPaddingBottom());
+		enterMouseX = e.x;
+		enterMouseY = e.y;
+	}
+	
+	public void onTargetMouseMove(DMouseEvent e) {
+		enterMouseX = e.x;
+		enterMouseY = e.y;
 	}
 	
 	public void onTargetMouseExit(DMouseEvent e) {
@@ -67,8 +58,9 @@ public class DSimpleTooltip {
 	
 	private void show() {
 		System.out.println("Show tooltip");
-		visible = true;
-		context.repaint(bounds);
+		
+		DSimpleTooltipComponent view = new DSimpleTooltipComponent(styleClass, tooltip);
+		window = context.openView(enterMouseX, enterMouseY + context.dp(8), DAnchor.TOP_LEFT, view);
 		
 		if (timerHandle != null) {
 			timerHandle.close();
@@ -78,29 +70,17 @@ public class DSimpleTooltip {
 	
 	private void hide() {
 		System.out.println("Hide tooltip");
-		visible = false;
-		context.repaint(bounds);
-	}
-	
-	public void setContext(DStylePath parent, DUIContext context) {
-		this.context = context;
 		
-		DStylePath path = parent.getChild("tooltip", styleClass);
-		style = new DTooltipStyle(context.getStylesheets().get(context, path));
-		fontMetrics = context.getFontMetrics(style.font);
-	}
-	
-	public void paint(DCanvas canvas) {
-		if (!visible)
-			return;
-		
-		System.out.println("Actually paint tooltip");
-		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
-		style.border.paint(canvas, bounds);
-		canvas.drawText(style.font, style.textColor, bounds.x + style.border.getPaddingLeft(), bounds.y + style.border.getPaddingTop(), tooltip.getValue());
+		if (window != null) {
+			window.close();
+			window = null;
+		}
 	}
 	
 	public void close() {
-		tooltipListener.close();
+		if (window != null) {
+			window.close();
+			window = null;
+		}
 	}
 }

DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltipComponent.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.drawablegui;
+
+import org.openzen.drawablegui.listeners.ListenerHandle;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.LiveString;
+import org.openzen.drawablegui.live.MutableLiveObject;
+import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylePath;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DSimpleTooltipComponent implements DComponent {
+	private final DStyleClass styleClass;
+	private final LiveString tooltip;
+	private final MutableLiveObject<DSizing> sizing = DSizing.create();
+	private final ListenerHandle<LiveString.Listener> tooltipListener;
+	
+	private DUIContext context;
+	private DIRectangle bounds;
+	private DFontMetrics fontMetrics;
+	private DSimpleTooltipStyle style;
+	
+	public DSimpleTooltipComponent(DStyleClass styleClass, LiveString tooltip) {
+		this.styleClass = styleClass;
+		this.tooltip = tooltip;
+		tooltipListener = tooltip.addListener(this::onTooltipChanged);
+	}
+	
+	private void onTooltipChanged(String oldValue, String newValue) {
+		if (context == null || bounds == null)
+			return;
+		
+		calculateSize();
+		bounds = new DIRectangle(
+				bounds.x,
+				bounds.y,
+				style.border.getPaddingLeft() + fontMetrics.getWidth(tooltip.getValue()) + style.border.getPaddingRight(),
+				style.border.getPaddingTop() + fontMetrics.getAscent() + fontMetrics.getDescent() + style.border.getPaddingBottom());
+		context.repaint(bounds);
+	}
+	
+	@Override
+	public void setBounds(DIRectangle bounds) {
+		this.bounds = bounds;
+	}
+	
+	@Override
+	public DIRectangle getBounds() {
+		return bounds;
+	}
+	
+	@Override
+	public int getBaselineY() {
+		return style.border.getPaddingTop() + fontMetrics.getAscent();
+	}
+	
+	@Override
+	public LiveObject<DSizing> getSizing() {
+		return sizing;
+	}
+	
+	@Override
+	public void setContext(DStylePath parent, DUIContext context) {
+		this.context = context;
+		
+		DStylePath path = parent.getChild("tooltip", styleClass);
+		style = new DSimpleTooltipStyle(context.getStylesheets().get(context, path));
+		fontMetrics = context.getFontMetrics(style.font);
+		calculateSize();
+	}
+	
+	@Override
+	public void paint(DCanvas canvas) {
+		System.out.println("Actually paint tooltip");
+		canvas.fillRectangle(bounds.x, bounds.y, bounds.width, bounds.height, style.backgroundColor);
+		style.border.paint(canvas, bounds);
+		canvas.drawText(
+				style.font,
+				style.textColor,
+				bounds.x + style.border.getPaddingLeft(),
+				bounds.y + style.border.getPaddingTop() + fontMetrics.getAscent(),
+				tooltip.getValue());
+	}
+	
+	@Override
+	public void close() {
+		tooltipListener.close();
+	}
+	
+	private void calculateSize() {
+		sizing.setValue(new DSizing(
+				style.border.getPaddingLeft() + fontMetrics.getWidth(tooltip.getValue()) + style.border.getPaddingRight(),
+				style.border.getPaddingTop() + fontMetrics.getAscent() + fontMetrics.getDescent() + style.border.getPaddingBottom()));
+	}
+}

DrawableGui/src/main/java/org/openzen/drawablegui/DTooltipStyle.java → DrawableGui/src/main/java/org/openzen/drawablegui/DSimpleTooltipStyle.java

@@ -15,15 +15,15 @@ import org.openzen.drawablegui.style.DStyleDefinition;
  *
  * @author Hoofdgebruiker
  */
-public class DTooltipStyle {
+public class DSimpleTooltipStyle {
 	public final DBorder border;
 	public final DFont font;
 	public final int backgroundColor;
 	public final int textColor;
 	
-	public DTooltipStyle(DStyleDefinition style) {
+	public DSimpleTooltipStyle(DStyleDefinition style) {
 		border = style.getBorder("border", context -> new DCompositeBorder(
-				new DLineBorder(0xFF, 1),
+				new DLineBorder(0xFF000000, 1),
 				new DPaddedBorder(context.dp(4), context.dp(4), context.dp(4), context.dp(4))));
 		font = style.getFont("font", context -> new DFont(DFontFamily.UI, false, false, false, context.sp(12)));
 		backgroundColor = style.getColor("backgroundColor", 0xFFFFFFE1);

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

@@ -1,26 +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.DStylePath;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface DTooltip {
-	void setContext(DUIContext context, DStylePath parent);
-	
-	int getWidth();
-	
-	int getHeight();
-	
-	void setBounds(DIRectangle bounds);
-	
-	DIRectangle getBounds();
-	
-	void paint(DCanvas canvas);
-}

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

@@ -1,14 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.openzen.drawablegui;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public interface DTooltipHandle {
-	void close();
-}

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

@@ -40,8 +40,6 @@ public interface DUIContext {
 	
 	DUIWindow openView(int x, int y, DAnchor anchor, DComponent root);
 	
-	DTooltipHandle openTooltip(int x, int y, DTooltip tooltip);
-	
 	default int dp(float dp) {
 		return (int)(dp * getScale());
 	}

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

@@ -15,8 +15,6 @@ import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
 import org.openzen.drawablegui.DTimerHandle;
-import org.openzen.drawablegui.DTooltip;
-import org.openzen.drawablegui.DTooltipHandle;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveInt;
 import org.openzen.drawablegui.live.LiveObject;
@@ -333,11 +331,6 @@ public class DScrollPane implements DComponent {
 		public DUIWindow openView(int x, int y, DAnchor anchor, DComponent root) {
 			return context.openView(toGlobalX(x), toGlobalY(y), anchor, root);
 		}
-		
-		@Override
-		public DTooltipHandle openTooltip(int x, int y, DTooltip tooltip) {
-			return context.openTooltip(toGlobalX(x), toGlobalY(y), tooltip);
-		}
 	}
 	
 	private class ScrollListener implements LiveInt.Listener {

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

@@ -8,6 +8,7 @@ package org.openzen.drawablegui.swing;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
+import java.awt.Point;
 import java.awt.geom.GeneralPath;
 import java.util.WeakHashMap;
 import javax.swing.JFrame;
@@ -21,8 +22,6 @@ import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontMetrics;
 import org.openzen.drawablegui.DPathTracer;
 import org.openzen.drawablegui.DTimerHandle;
-import org.openzen.drawablegui.DTooltip;
-import org.openzen.drawablegui.DTooltipHandle;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DUIWindow;
 import org.openzen.drawablegui.style.DStylePathRoot;
@@ -171,29 +170,31 @@ public class SwingGraphicsContext implements DUIContext {
 
 	@Override
 	public DUIWindow openView(int x, int y, DAnchor anchor, DComponent root) {
-		SwingDialog window = new SwingDialog((SwingWindow)this.window, "", root, false);
+		SwingWindow swingWindow = (SwingWindow)this.window;
+		SwingInlineWindow window = new SwingInlineWindow(swingWindow, "", root);
 		SwingGraphicsContext windowContext = new SwingGraphicsContext(stylesheets, scale, textScale, window.swingComponent);
 		windowContext.setWindow(window);
 		windowContext.graphics = this.graphics; // help a little...
 		
 		root.setContext(DStylePathRoot.INSTANCE, windowContext);
 		DSizing dimension = root.getSizing().getValue();
-		int tx = (int)(x - anchor.alignX * dimension.preferredWidth);
-		int ty = (int)(y - anchor.alignY * dimension.preferredHeight);
 		
-		window.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		Point rootLocation = swingWindow.swingComponent.getLocationOnScreen();
+		
+		int tx = (int)(x + rootLocation.x - anchor.alignX * dimension.preferredWidth);
+		int ty = (int)(y + rootLocation.y - anchor.alignY * dimension.preferredHeight);
+		System.out.println("Position: " + tx + ", " + ty);
+		
 		window.swingComponent.setPreferredSize(new Dimension(dimension.preferredWidth, dimension.preferredHeight));
 		window.setLocation(tx, ty);
 		window.pack();
 		window.setVisible(true);
+		window.swingComponent.repaint();
+		
+		System.out.println("Window size: " + window.getWidth() + " x " + window.getHeight());
 		return window;
 	}
 	
-	@Override
-	public DTooltipHandle openTooltip(int x, int y, DTooltip tooltip) {
-		return null; // TODO
-	}
-	
 	private class PathTracer implements DPathTracer {
 		private final GeneralPath path;
 		

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

@@ -0,0 +1,136 @@
+/*
+ * 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.BorderLayout;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+import java.awt.event.WindowStateListener;
+import javax.swing.JWindow;
+import org.openzen.drawablegui.DComponent;
+import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.DUIWindow;
+import org.openzen.drawablegui.live.ImmutableLiveObject;
+import org.openzen.drawablegui.live.LiveBool;
+import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.SimpleLiveBool;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public final class SwingInlineWindow extends JWindow implements WindowListener, WindowStateListener, DUIWindow {
+	public final SwingRoot swingComponent;
+	private final LiveObject<State> state = new ImmutableLiveObject<>(State.NORMAL);
+	private final SimpleLiveBool active = new SimpleLiveBool(true);
+	
+	public SwingInlineWindow(SwingWindow owner, String title, DComponent root) {
+		super(owner);
+		
+		addWindowListener(this);
+		addWindowStateListener(this);
+		
+		getContentPane().add(swingComponent = new SwingRoot(root), BorderLayout.CENTER);
+		swingComponent.setWindow(this);
+		swingComponent.requestFocusInWindow();
+	}
+	
+	@Override
+	public DUIContext getContext() {
+		return swingComponent.context;
+	}
+
+	@Override
+	public DIRectangle getWindowBounds() {
+		return new DIRectangle(getX(), getY(), getWidth(), getHeight());
+	}
+
+	@Override
+	public boolean hasTitleBar() {
+		return false;
+	}
+
+	@Override
+	public void close() {
+		dispose();
+	}
+
+	@Override
+	public void maximize() {
+		// cannot maximize
+	}
+
+	@Override
+	public void restore() {
+		// cannot restore
+	}
+
+	@Override
+	public void minimize() {
+		// cannot minimize
+	}
+
+	@Override
+	public LiveObject<State> getWindowState() {
+		return state;
+	}
+	
+	@Override
+	public LiveBool getActive() {
+		return active;
+	}
+	
+	@Override
+	public void focus(DComponent component) {
+		swingComponent.focus(component);
+	}
+	
+	@Override
+	public DUIWindow openModal(String title, DComponent component) {
+		throw new IllegalArgumentException("Cannot open a modal from an inline window!");
+	}
+
+	@Override
+	public void windowOpened(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowClosing(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowClosed(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowIconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowDeiconified(WindowEvent e) {
+		
+	}
+
+	@Override
+	public void windowActivated(WindowEvent e) {
+		active.setValue(true);
+	}
+
+	@Override
+	public void windowDeactivated(WindowEvent e) {
+		active.setValue(false);
+	}
+
+	@Override
+	public void windowStateChanged(WindowEvent e) {
+		
+	}
+}

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

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

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

@@ -1,32 +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 javax.swing.JWindow;
-import org.openzen.drawablegui.DComponent;
-import org.openzen.drawablegui.DTooltipHandle;
-import org.openzen.drawablegui.style.DStylePathRoot;
-
-/**
- *
- * @author Hoofdgebruiker
- */
-public class SwingTooltipWindow extends JWindow implements DTooltipHandle {
-	private final SwingGraphicsContext context;
-	
-	public SwingTooltipWindow(SwingGraphicsContext parent, DComponent rootComponent) {
-		SwingRoot root = new SwingRoot(rootComponent);
-		context = new SwingGraphicsContext(parent.getStylesheets(), parent.getScale(), parent.getTextScale(), root);
-		rootComponent.setContext(DStylePathRoot.INSTANCE, context);
-		rootPane.add(root);
-		pack();
-	}
-	
-	@Override
-	public void close() {
-		dispose();
-	}
-}

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

@@ -28,7 +28,7 @@ import org.openzen.drawablegui.style.DStyleClass;
  * @author Hoofdgebruiker
  */
 public final class SwingWindow extends JFrame implements WindowListener, WindowStateListener, DUIWindow {
-	private final SwingRoot swingComponent;
+	public final SwingRoot swingComponent;
 	private final boolean noTitleBar;
 	private final SimpleLiveObject<State> state = new SimpleLiveObject<>(State.NORMAL);
 	private final SimpleLiveBool active = new SimpleLiveBool(true);

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

@@ -5,6 +5,7 @@
  */
 package org.openzen.zenscript.ide.ui;
 
+import org.openzen.drawablegui.live.ImmutableLiveString;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LivePredicateBool;
 import org.openzen.drawablegui.live.MutableLiveObject;
@@ -66,24 +67,24 @@ public class IDEWindow {
 	
 	private void init() {
 		projectToolbar = new IDEAspectToolbar(0, ShadedProjectIcon.PURPLE, "Project", "Project management");
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLUE, AddBoxIcon.GRAY, addContentDisabled, e -> {
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.BLUE, AddBoxIcon.GRAY, addContentDisabled, new ImmutableLiveString("Create package"), e -> {
 			CreatePackageDialog dialog = new CreatePackageDialog(this, contextModule.getValue(), contextPackage.getValue());
 			dialog.open(e.window);
 		}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.ORANGE, AddBoxIcon.GRAY, addContentDisabled, e -> {
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, AddBoxIcon.ORANGE, AddBoxIcon.GRAY, addContentDisabled, new ImmutableLiveString("Create source file"), e -> {
 			CreateSourceFileDialog dialog = new CreateSourceFileDialog(this, contextModule.getValue(), contextPackage.getValue());
 			dialog.open(e.window);
 		}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.PURPLE, e -> {
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, SettingsIcon.PURPLE, new ImmutableLiveString("Project settings"), e -> {
 			
 		}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, BuildIcon.BLUE, e -> {
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, BuildIcon.BLUE, new ImmutableLiveString("Build"), e -> {
 			for (IDETarget target : host.getTargets()) {
 				if (target.canBuild())
 					target.build();
 			}
 		}));
-		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, PlayIcon.GREEN, e -> {
+		projectToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, PlayIcon.GREEN, new ImmutableLiveString("Run"), e -> {
 			for (IDETarget target : host.getTargets()) {
 				if (target.canRun())
 					target.run();

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

@@ -15,10 +15,12 @@ import org.openzen.drawablegui.DPath;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.DUIContext;
 import org.openzen.drawablegui.DIRectangle;
+import org.openzen.drawablegui.DSimpleTooltip;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.ImmutableLiveBool;
 import org.openzen.drawablegui.live.LiveBool;
 import org.openzen.drawablegui.live.LiveObject;
+import org.openzen.drawablegui.live.LiveString;
 import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylePath;
@@ -34,6 +36,7 @@ public class IconButtonControl implements DComponent {
 	private final Consumer<DMouseEvent> onClick;
 	private final LiveBool disabled;
 	private final ListenerHandle<LiveBool.Listener> disabledListener;
+	private final DSimpleTooltip tooltip;
 	
 	private DUIContext context;
 	private IconButtonControlStyle style;
@@ -43,22 +46,25 @@ public class IconButtonControl implements DComponent {
 	private boolean press;
 	private DPath shape;
 	
-	public IconButtonControl(DStyleClass styleClass, DDrawable icon, DDrawable iconDisabled, LiveBool disabled, Consumer<DMouseEvent> onClick) {
+	public IconButtonControl(DStyleClass styleClass, DDrawable icon, DDrawable iconDisabled, LiveBool disabled, LiveString tooltip, Consumer<DMouseEvent> onClick) {
 		this.styleClass = styleClass;
 		this.icon = icon;
 		this.iconDisabled = iconDisabled;
 		this.onClick = onClick;
 		this.disabled = disabled;
+		this.tooltip = new DSimpleTooltip(DStyleClass.EMPTY, tooltip);
 		disabledListener = disabled.addListener((oldValue, newValue) -> repaint());
 	}
 	
-	public IconButtonControl(DStyleClass styleClass, DDrawable icon, Consumer<DMouseEvent> onClick) {
-		this(styleClass, icon, icon, ImmutableLiveBool.FALSE, onClick);
+	public IconButtonControl(DStyleClass styleClass, DDrawable icon, LiveString tooltip, Consumer<DMouseEvent> onClick) {
+		this(styleClass, icon, icon, ImmutableLiveBool.FALSE, tooltip, onClick);
 	}
 
 	@Override
 	public void setContext(DStylePath parent, DUIContext context) {
 		this.context = context;
+		tooltip.setContext(context);
+		
 		DStylePath path = parent.getChild("iconbutton", styleClass);
 		style = new IconButtonControlStyle(context.getStylesheets().get(context, path));
 		
@@ -132,6 +138,7 @@ public class IconButtonControl implements DComponent {
 	public void onMouseEnter(DMouseEvent e) {
 		hover = true;
 		repaint();
+		tooltip.onTargetMouseEnter(e);
 	}
 	
 	@Override
@@ -139,6 +146,12 @@ public class IconButtonControl implements DComponent {
 		hover = false;
 		press = false;
 		repaint();
+		tooltip.onTargetMouseExit(e);
+	}
+	
+	@Override
+	public void onMouseMove(DMouseEvent e) {
+		tooltip.onTargetMouseMove(e);
 	}
 	
 	@Override

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

@@ -42,7 +42,7 @@ public class AspectBarSelectorButton implements DComponent {
 	private DPath shape;
 	private boolean hovering;
 	private boolean pressing;
-	private DSimpleTooltip tooltip;
+	private final DSimpleTooltip tooltip;
 	
 	private final ListenerHandle<LiveBool.Listener> activeListener;
 	
@@ -69,7 +69,7 @@ public class AspectBarSelectorButton implements DComponent {
 				style.height,
 				style.roundingRadius);
 		
-		tooltip.setContext(parent, context);
+		tooltip.setContext(context);
 	}
 
 	@Override
@@ -119,7 +119,6 @@ public class AspectBarSelectorButton implements DComponent {
 				bounds.x + (style.width - icon.getNominalWidth() * context.getScale()) / 2,
 				bounds.y + (style.height - icon.getNominalHeight() * context.getScale()) / 2,
 				context.getScale()));
-		tooltip.paint(canvas);
 	}
 	
 	@Override
@@ -129,6 +128,11 @@ public class AspectBarSelectorButton implements DComponent {
 		repaint();
 	}
 	
+	@Override
+	public void onMouseMove(DMouseEvent e) {
+		tooltip.onTargetMouseMove(e);
+	}
+	
 	@Override
 	public void onMouseExit(DMouseEvent e) {
 		hovering = false;

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

@@ -19,7 +19,6 @@ import org.openzen.drawablegui.DTimerHandle;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveObject;
-import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.zenscript.ide.host.IDESourceFile;
 import org.openzen.zenscript.ide.ui.IDEAspectToolbar;
 import org.openzen.zenscript.ide.ui.IDEWindow;
@@ -29,6 +28,7 @@ import org.openzen.zenscript.lexer.ZSToken;
 import org.openzen.zenscript.lexer.ZSTokenParser;
 import org.openzen.zenscript.lexer.ZSTokenType;
 import org.openzen.drawablegui.DUIContext;
+import org.openzen.drawablegui.live.ImmutableLiveString;
 import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveBool;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -83,7 +83,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, ShadedSaveIcon.PURPLE, SaveIcon.GREY, unchanged, e -> save()));
+		editToolbar.controls.add(() -> new IconButtonControl(DStyleClass.EMPTY, ShadedSaveIcon.PURPLE, SaveIcon.GREY, unchanged, new ImmutableLiveString("Save file"), e -> save()));
 		
 		try {
 			TokenParser<ZSToken, ZSTokenType> parser = ZSTokenParser.createRaw(