Merge branch 'development' into feature/storagetags

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

@@ -96,7 +96,7 @@ public class DInputField implements DComponent {
 		
 		if (cursor != null)
 			cursor.close();
-		cursor = parent.fillRect(2, DIRectangle.EMPTY, cursorBlink ? style.cursorColor : 0);
+		cursor = parent.fillRect(3, DIRectangle.EMPTY, cursorBlink ? style.cursorColor : 0);
 		
 		if (selection != null)
 			selection.close();
@@ -152,6 +152,7 @@ public class DInputField implements DComponent {
 		text.setPosition(
 				bounds.x + style.margin.left + style.border.getPaddingLeft(),
 				bounds.y + style.margin.top + style.border.getPaddingTop() + fontMetrics.getAscent());
+		
 		style.border.update(context, bounds);
 	}
 	

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

@@ -0,0 +1,22 @@
+/*
+ * 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.DDimension;
+
+/**
+ *
+ * @author Hoofdgebruiker
+ */
+public class DScalableSize {
+	public final DDimension width;
+	public final DDimension height;
+	
+	public DScalableSize(DDimension width, DDimension height) {
+		this.width = width;
+		this.height = height;
+	}
+}

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

@@ -28,10 +28,10 @@ public class DFormStyle {
 	public final int minimumFieldSize;
 	
 	public DFormStyle(DStyleDefinition style) {
-		paddingLeft = style.getDimension("paddingLeft", new DDpDimension(16));
-		paddingTop = style.getDimension("paddingTop", new DDpDimension(16));
-		paddingRight = style.getDimension("paddingRight", new DDpDimension(16));
-		paddingBottom = style.getDimension("paddingBottom", new DDpDimension(16));
+		paddingLeft = style.getDimension("paddingLeft", DPxDimension.ZERO);
+		paddingTop = style.getDimension("paddingTop", DPxDimension.ZERO);
+		paddingRight = style.getDimension("paddingRight", DPxDimension.ZERO);
+		paddingBottom = style.getDimension("paddingBottom", DPxDimension.ZERO);
 		spacing = style.getDimension("spacing", new DDpDimension(8));
 		
 		labelColor = style.getColor("labelColor", 0xFF000000);

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

@@ -244,7 +244,7 @@ public class DLinearLayout extends BaseComponentGroup {
 				DSizing preferences = element.component.getSizing().getValue();
 				int newX = x + preferences.preferredWidth;
 				layoutHorizontal(element, x, newX - x);
-				x = newX;
+				x = newX + style.spacing;
 			}
 		} else {
 			float deltaScaled = delta / totalGrow;
@@ -269,7 +269,7 @@ public class DLinearLayout extends BaseComponentGroup {
 				DSizing preferences = element.component.getSizing().getValue();
 				int newY = y + preferences.preferredHeight;
 				layoutVertical(element, y, newY - y);
-				y = newY;
+				y = newY + style.spacing;
 			}
 		} else {
 			float deltaScaled = delta / totalGrow;

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

@@ -10,6 +10,7 @@ import org.openzen.drawablegui.DComponentContext;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.DIRectangle;
 import org.openzen.drawablegui.DMouseEvent;
+import org.openzen.drawablegui.DScalableSize;
 import org.openzen.drawablegui.DTransform2D;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveInt;
@@ -17,6 +18,7 @@ import org.openzen.drawablegui.live.LiveObject;
 import org.openzen.drawablegui.live.SimpleLiveInt;
 import org.openzen.drawablegui.draw.DDrawnShape;
 import org.openzen.drawablegui.draw.DSubSurface;
+import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.style.DStyleClass;
 
 /**
@@ -37,7 +39,8 @@ public class DScrollPane implements DComponent, DScrollContext {
 	private final LiveInt offsetX;
 	private final LiveInt offsetY;
 	
-	private final LiveObject<DSizing> sizing;
+	private final SimpleLiveObject<DSizing> sizing = new SimpleLiveObject<>(DSizing.EMPTY);
+	private final LiveObject<DScalableSize> size;
 	
 	private final ListenerHandle<LiveInt.Listener> contentsHeightListener;
 	private final ListenerHandle<LiveInt.Listener> offsetXListener;
@@ -48,8 +51,8 @@ public class DScrollPane implements DComponent, DScrollContext {
 	
 	private DSubSurface subSurface;
 	
-	public DScrollPane(DStyleClass styleClass, DComponent contents, LiveObject<DSizing> sizing) {
-		this.sizing = sizing;
+	public DScrollPane(DStyleClass styleClass, DComponent contents, LiveObject<DScalableSize> size) {
+		this.size = size;
 		this.styleClass = styleClass;
 		this.contents = contents;
 		
@@ -81,6 +84,10 @@ public class DScrollPane implements DComponent, DScrollContext {
 		DComponentContext newContext = new DComponentContext(this, context.path, 0, subSurface);
 		contents.mount(newContext);
 		scrollBar.mount(context);
+		
+		sizing.setValue(new DSizing(
+				size.getValue().width.evalInt(parent.getUIContext()),
+				size.getValue().height.evalInt(parent.getUIContext())));
 	}
 	
 	@Override

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

@@ -53,5 +53,6 @@ public class SwingDrawnRectangle extends SwingDrawnElement implements DDrawnRect
 	public void paint(Graphics2D g, DIRectangle clip) {
 		g.setColor(awtColor);
 		g.fillRect(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+		//g.fillRect(clip.x, clip.y, 3, 3);
 	}
 }

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

@@ -88,6 +88,7 @@ public final class SwingRoot extends Component implements ComponentListener, Mou
 		Rectangle clipBounds = g.getClipBounds();
 		DIRectangle clipBounds2 = clipBounds == null ? null : new DIRectangle(clipBounds.x, clipBounds.y, clipBounds.width, clipBounds.height);
 		Graphics2D g2d = (Graphics2D) g;
+		//System.out.println("Transform: " + g2d.getTransform().getTranslateX() + ", " + g2d.getTransform().getTranslateY());
 		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
 		surface.paint(g2d, clipBounds2);

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

@@ -7,6 +7,7 @@ package org.openzen.drawablegui.tree;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.openzen.drawablegui.DColorableIcon;
 import org.openzen.drawablegui.DColorableIconInstance;
 import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DComponentContext;
@@ -20,7 +21,6 @@ import org.openzen.drawablegui.DDrawableInstance;
 import org.openzen.drawablegui.Destructible;
 import org.openzen.drawablegui.listeners.ListenerHandle;
 import org.openzen.drawablegui.live.LiveBool;
-import org.openzen.drawablegui.draw.DDrawSurface;
 import org.openzen.drawablegui.draw.DDrawnRectangle;
 import org.openzen.drawablegui.draw.DDrawnText;
 import org.openzen.drawablegui.live.LiveList;
@@ -38,6 +38,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 	
 	private DComponentContext context;
 	private DIRectangle bounds = DIRectangle.EMPTY;
+	private float iconScale;
 	
 	private int selectedRow = -1;
 	private N selectedNode = null;
@@ -76,6 +77,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		context = parent.getChildContext("tree", styleClass);
 		style = context.getStyle(DTreeViewStyle::new);
 		fontMetrics = context.getFontMetrics(style.font);
+		iconScale = context.getUIContext().getScale() / 1.75f;
 		
 		background = context.fillRect(0, DIRectangle.EMPTY, style.backgroundColor);
 		selectedBackground = context.fillRect(1, DIRectangle.EMPTY, 0);
@@ -123,7 +125,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		int rowIndex = yToRow(e.y);
 		if (rowIndex >= 0 && rowIndex < rows.size()) {
 			Row rowEntry = rows.get(rowIndex);
-			if (e.x >= rowEntry.x && e.x < (rowEntry.x + nodeOpenedIcon.getNominalWidth())) {
+			if (e.x >= rowEntry.x && e.x < (rowEntry.x + getIconWidth(nodeOpenedIcon))) {
 				if (!rowEntry.node.isLeaf())
 					rowEntry.node.isCollapsed().toggle();
 				return;
@@ -142,15 +144,15 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 				int selectionY = bounds.y + style.padding + rowIndex * (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent()) - style.selectedPaddingTop;
 				int selectionWidth = (int)(fontMetrics.getWidth(row.node.getTitle())
 						+ style.iconTextSpacing
-						+ row.icon.getNominalWidth()
+						+ getIconWidth(row.icon)
 						+ style.iconTextSpacing
-						+ row.node.getIcon().getNominalWidth()
+						+ getIconWidth(row.node.getIcon())
 						+ style.selectedPaddingLeft
 						+ style.selectedPaddingRight);
 				int selectionHeight = fontMetrics.getAscent() + fontMetrics.getDescent() + style.selectedPaddingTop + style.selectedPaddingBottom;
 				
 				if (row.node.isLeaf()) {
-					int delta = (int)(row.icon.getNominalWidth() + style.iconTextSpacing);
+					int delta = (int)(getIconWidth(row.icon) + style.iconTextSpacing);
 					selectionX += delta;
 					selectionWidth -= delta;
 				}
@@ -181,6 +183,22 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 		return (y - bounds.y - style.padding) / (style.rowSpacing + fontMetrics.getAscent() + fontMetrics.getDescent());
 	}
 	
+	private float getIconWidth(DDrawable drawable) {
+		return drawable.getNominalWidth() * iconScale;
+	}
+	
+	private float getIconHeight(DDrawable drawable) {
+		return drawable.getNominalHeight() * iconScale; 
+	}
+	
+	private float getIconWidth(DColorableIcon icon) {
+		return icon.getNominalWidth() * iconScale;
+	}
+	
+	private float getIconHeight(DColorableIcon icon) {
+		return icon.getNominalHeight() * iconScale; 
+	}
+	
 	private void updateLayout() {
 		int oldRowCount = rows.size();
 		
@@ -264,7 +282,7 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 					context.surface,
 					context.z + 2,
 					node.getIcon(),
-					DTransform2D.translate(baseX + icon.getNominalWidth() + style.iconTextSpacing, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()),
+					DTransform2D.scaleAndTranslate(baseX + getIconWidth(icon) + style.iconTextSpacing, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon), iconScale),
 					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor);
 			
 			if (!node.isLeaf())
@@ -272,13 +290,13 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 						context.surface, 
 						context.z + 2,
 						icon,
-						DTransform2D.translate(baseX, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()));
+						DTransform2D.scaleAndTranslate(baseX, baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon), iconScale));
 			
 			text = context.drawText(
 					2,
 					style.font,
 					node == selectedNode ? style.selectedNodeTextColor : style.nodeTextColor,
-					baseX + style.iconTextSpacing + icon.getNominalWidth() + style.iconTextSpacing + node.getIcon().getNominalWidth(),
+					baseX + style.iconTextSpacing + getIconWidth(icon) + style.iconTextSpacing + getIconWidth(node.getIcon()),
 					baseY + fontMetrics.getAscent(),
 					node.getTitle());
 		}
@@ -288,15 +306,17 @@ public class DTreeView<N extends DTreeNode<N>> implements DComponent {
 			int baseY = (int)(bounds.y + style.padding + index * (fontMetrics.getAscent() + fontMetrics.getDescent() + style.rowSpacing));
 			
 			if (collapseIcon != null) {
-				collapseIcon.setTransform(DTransform2D.translate(
+				collapseIcon.setTransform(DTransform2D.scaleAndTranslate(
 						baseX,
-						baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()));
+						baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon),
+						iconScale));
 			}
-			nodeIcon.setTransform(DTransform2D.translate(
-					baseX + icon.getNominalWidth() + style.iconTextSpacing,
-					baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - icon.getNominalHeight()));
+			nodeIcon.setTransform(DTransform2D.scaleAndTranslate(
+					baseX + getIconWidth(icon) + style.iconTextSpacing,
+					baseY + fontMetrics.getAscent() + fontMetrics.getDescent() - getIconHeight(icon),
+					iconScale));
 			text.setPosition(
-					baseX + style.iconTextSpacing + icon.getNominalWidth() + style.iconTextSpacing + node.getIcon().getNominalWidth(),
+					baseX + style.iconTextSpacing + getIconWidth(icon) + style.iconTextSpacing + getIconWidth(node.getIcon()),
 					baseY + fontMetrics.getAscent());
 		}
 

IDE/src/main/java/org/openzen/zenscript/ide/ui/dialog/CreateSourceFileDialog.java

@@ -23,7 +23,9 @@ import org.openzen.drawablegui.live.ImmutableLiveBool;
 import org.openzen.drawablegui.live.ImmutableLiveString;
 import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.style.DDpDimension;
+import org.openzen.drawablegui.style.DSimpleStylesheet;
 import org.openzen.drawablegui.style.DStyleClass;
+import org.openzen.drawablegui.style.DStylesheetBuilder;
 import org.openzen.zenscript.ide.host.IDEModule;
 import org.openzen.zenscript.ide.host.IDEPackage;
 import org.openzen.zenscript.ide.host.IDESourceFile;
@@ -64,14 +66,18 @@ public class CreateSourceFileDialog {
 		DButton ok = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Create"), ImmutableLiveBool.FALSE, this::ok);
 		DButton cancel = new DButton(DStyleClass.EMPTY, new SimpleLiveString("Cancel"), ImmutableLiveBool.FALSE, this::cancel);
 		DLinearLayout buttons = new DLinearLayout(
-				DStyleClass.EMPTY,
+				DStyleClass.inline(new DStylesheetBuilder()
+					.dimensionDp("spacing", 8)
+					.build()),
 				Orientation.HORIZONTAL,
 				Alignment.RIGHT,
 				new Element(cancel, 0, 0, ElementAlignment.TOP),
 				new Element(ok, 0, 0, ElementAlignment.TOP));
 
 		root = new DLinearLayout(
-				DStyleClass.EMPTY,
+				DStyleClass.inline(new DStylesheetBuilder()
+						.marginDp("margin", 16)
+						.build()),
 				Orientation.VERTICAL,
 				Alignment.MIDDLE,
 				new Element(form, 1, 1, ElementAlignment.CENTER),

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

@@ -47,7 +47,7 @@ public class TabbedViewTabClose implements DComponent {
 		context = parent.getChildContext("tabclose", DStyleClass.EMPTY);
 		style = context.getStyle(TabbedViewTabCloseStyle::new);
 		sizing.setValue(new DSizing(style.size, style.size));
-		icon = new ScalableCloseIcon(style.size / 24);
+		icon = new ScalableCloseIcon(style.size / 24 * parent.getScale() / 1.75f);
 		
 		if (background != null)
 			background.close();

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

@@ -6,16 +6,15 @@
 package org.openzen.zenscript.ide.ui.view;
 
 import org.openzen.drawablegui.DEmptyView;
+import org.openzen.drawablegui.DScalableSize;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.border.DLineBorder;
 import org.openzen.drawablegui.scroll.DScrollPane;
 import org.openzen.drawablegui.layout.DSideLayout;
-import org.openzen.drawablegui.live.LiveArrayList;
 import org.openzen.drawablegui.live.LiveString;
-import org.openzen.drawablegui.live.MutableLiveList;
-import org.openzen.drawablegui.live.SimpleLiveInt;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveString;
+import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
 import org.openzen.drawablegui.style.DStylesheetBuilder;
@@ -25,7 +24,6 @@ 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;
-import org.openzen.zenscript.ide.ui.view.output.OutputLine;
 import org.openzen.zenscript.ide.ui.view.output.OutputView;
 import org.openzen.zenscript.ide.ui.view.project.ProjectBrowser;
 
@@ -49,12 +47,12 @@ public final class WindowView extends DSideLayout {
 		
 		OutputView output = new OutputView(DStyleClass.EMPTY, window.output);
 		
+		DScalableSize outputSize = new DScalableSize(new DDpDimension(250), new DDpDimension(250));
 		DScrollPane scrollOutput = new DScrollPane(DStyleClass.inline(new DStylesheetBuilder()
-							//.border("border", context -> new DLineBorder(0xFF888888, 1))
 							.marginDp("margin", 3)
 							.color("backgroundColor", 0xFFFFFFFF)
 							.shadow("shadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()))
-							.build()), output, new SimpleLiveObject<>(new DSizing(400, 400)));
+							.build()), output, new SimpleLiveObject<>(outputSize));
 		
 		setMain(tabs = new TabbedView(DStyleClass.inline(new DStylesheetBuilder()
 				.marginDp("margin", 3)
@@ -71,13 +69,14 @@ public final class WindowView extends DSideLayout {
 		@Override
 		public void onOpen(IDESourceFile sourceFile) {
 			SourceEditor editor = new SourceEditor(DStyleClass.EMPTY, window, sourceFile);
+			DScalableSize size = new DScalableSize(new DDpDimension(280), new DDpDimension(280));
 			TabbedViewComponent tab = new TabbedViewComponent(
 					sourceFile.getName(),
 					null,
 					new DScrollPane(DStyleClass.inline(new DStylesheetBuilder()
 							.border("border", context -> new DLineBorder(0xFF888888, 1))
 							//.shadow("shadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()))
-							.build()), editor, new SimpleLiveObject<>(new DSizing(500, 500))),
+							.build()), editor, new SimpleLiveObject<>(size)),
 					editor.isUpdated());
 			tabs.tabs.add(tab);
 			tabs.currentTab.setValue(tab);

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

@@ -52,7 +52,6 @@ import org.openzen.zenscript.ide.ui.view.IconButtonControl;
  */
 public class SourceEditor implements DComponent {
 	private final DStyleClass styleClass;
-	private final DFont font = new DFont(DFontFamily.CODE, false, false, false, 24);
 	private final MutableLiveObject<DSizing> sizing = DSizing.create();
 	private final String tab = "    ";
 	private final IDESourceFile sourceFile;
@@ -65,6 +64,7 @@ public class SourceEditor implements DComponent {
 	private SourceEditorStyle style;
 	private DTimerHandle blinkTimer;
 	
+	private DFont font;
 	private DFontMetrics fontMetrics;
 	private int textLineHeight;
 	private int fullLineHeight;
@@ -140,6 +140,7 @@ public class SourceEditor implements DComponent {
 		
 		context = parent.getChildContext("sourceeditor", styleClass);
 		style = context.getStyle(SourceEditorStyle::new);
+		font = new DFont(DFontFamily.CODE, false, false, false, (int)(context.getScale() * 13.7 + 0.5f));
 		
 		fontMetrics = context.getFontMetrics(font);
 		textLineHeight = fontMetrics.getAscent() + fontMetrics.getDescent();

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

@@ -9,6 +9,7 @@ import org.openzen.drawablegui.DComponent;
 import org.openzen.drawablegui.DFont;
 import org.openzen.drawablegui.DFontFamily;
 import org.openzen.drawablegui.DLabel;
+import org.openzen.drawablegui.DScalableSize;
 import org.openzen.drawablegui.DSizing;
 import org.openzen.drawablegui.border.DEmptyBorder;
 import org.openzen.drawablegui.border.DPaddedBorder;
@@ -24,6 +25,7 @@ import org.openzen.drawablegui.live.MutableLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveObject;
 import org.openzen.drawablegui.live.SimpleLiveString;
 import org.openzen.drawablegui.scroll.DScrollPane;
+import org.openzen.drawablegui.style.DDpDimension;
 import org.openzen.drawablegui.style.DRoundedRectangleShape;
 import org.openzen.drawablegui.style.DShadow;
 import org.openzen.drawablegui.style.DStyleClass;
@@ -107,6 +109,8 @@ public class ProjectBrowser {
 				ExpandedArrow.INSTANCE,
 				CollapsedArrow.INSTANCE,
 				new RootTreeNode(this, host), false);
+		
+		DScalableSize treeSize = new DScalableSize(new DDpDimension(280), new DDpDimension(280));
 		DScrollPane treeScrollPane = new DScrollPane(
 				DStyleClass.inline("projectView", new DStylesheetBuilder()
 						.shape("shape", context -> new DRoundedRectangleShape(0, 0, context.dp(2), context.dp(2)))
@@ -114,7 +118,7 @@ public class ProjectBrowser {
 						.shadow("shadow", context -> new DShadow(0xFF888888, 0, 0.5f * context.getScale(), 3 * context.getScale()))
 						.build()),
 				projectTree,
-				new SimpleLiveObject<>(new DSizing(500, 500)));
+				new SimpleLiveObject<>(treeSize));
 		
 		view = new DLinearLayout(
 				DStyleClass.inline(new DStylesheetBuilder()