Merge remote-tracking branch 'Stan/development' into development

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

@@ -0,0 +1,26 @@
+/*
+ * 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

@@ -0,0 +1,14 @@
+/*
+ * 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,6 +40,8 @@ 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,6 +15,8 @@ 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;
@@ -231,12 +233,28 @@ public class DScrollPane implements DComponent {
 	private DMouseEvent translateMouseEvent(DMouseEvent e) {
 		return new DMouseEvent(
 				e.window,
-				e.x - bounds.x + offsetX.getValue(),
-				e.y - bounds.y + offsetY.getValue(),
+				toLocalX(e.x),
+				toLocalY(e.y),
 				e.modifiers,
 				e.deltaZ,
 				e.clickCount);
 	}
+
+	private int toGlobalX(int x) {
+		return x + bounds.x - offsetX.getValue();
+	}
+
+	private int toGlobalY(int y) {
+		return y + bounds.y - offsetY.getValue();
+	}
+
+	private int toLocalX(int x) {
+		return x - bounds.x + offsetX.getValue();
+	}
+
+	private int toLocalY(int y) {
+		return y - bounds.y + offsetY.getValue();
+	}
 	
 	private class TranslatedContext implements DUIContext {
 		
@@ -257,8 +275,8 @@ public class DScrollPane implements DComponent {
 
 		@Override
 		public void repaint(int x, int y, int width, int height) {
-			int left = x + bounds.x - offsetX.getValue();
-			int top = y + bounds.y - offsetY.getValue();
+			int left = toGlobalX(x);
+			int top = toGlobalY(y);
 			int right = left + width;
 			int bottom = top + height;
 			
@@ -308,12 +326,17 @@ public class DScrollPane implements DComponent {
 
 		@Override
 		public DUIWindow openDialog(int x, int y, DAnchor anchor, String title, DComponent root) {
-			return context.openDialog(x, y, anchor, title, root);
+			return context.openDialog(toGlobalX(x), toGlobalY(y), anchor, title, root);
 		}
 
 		@Override
 		public DUIWindow openView(int x, int y, DAnchor anchor, DComponent root) {
-			return context.openView(x, y, anchor, 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);
 		}
 	}
 	

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

@@ -21,6 +21,8 @@ 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;
@@ -187,6 +189,11 @@ public class SwingGraphicsContext implements DUIContext {
 		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/SwingTooltipWindow.java

@@ -0,0 +1,32 @@
+/*
+ * 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();
+	}
+}

Parser/src/main/java/org/openzen/zenscript/parser/expression/ParsedExpressionFunction.java

@@ -78,8 +78,7 @@ public class ParsedExpressionFunction extends ParsedExpression {
 		}
 		
 		FunctionTypeID functionType = scope.getTypeRegistry().getFunction(genericHeader.withGenericArguments(new GenericMapper(scope.getTypeRegistry(), scope.genericInferenceMap)));
-		definedHeader = definedHeader.forLambda(functionType.header);
-		return new FunctionExpression(position, functionType, closure, definedHeader, statements);
+		return new FunctionExpression(position, functionType, closure, header, statements);
 	}
 	
 	@Override