From 45e7d3e589c924bb7cc5c888c6fc5088c0be1ee2 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Sat, 28 Dec 2019 15:54:40 +0100
Subject: [PATCH] Update grid graphic

---
 Sources/arm/ui/UIBox.hx   |  8 ++++----
 Sources/arm/ui/UINodes.hx | 27 ++++++++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Sources/arm/ui/UIBox.hx b/Sources/arm/ui/UIBox.hx
index b1fa1444..9e59d4d9 100644
--- a/Sources/arm/ui/UIBox.hx
+++ b/Sources/arm/ui/UIBox.hx
@@ -16,7 +16,7 @@ class UIBox {
 	public static var clickToHide = true;
 	static var modalW = 400;
 	static var modalH = 170;
-	static var drawn = false;
+	static var draws = 0;
 
 	public static function render(g: kha.graphics2.Graphics) {
 		g.end();
@@ -60,7 +60,7 @@ class UIBox {
 		}
 
 		g.begin(false);
-		drawn = true;
+		draws++;
 	}
 
 	public static function update() {
@@ -70,7 +70,7 @@ class UIBox {
 		var ui = App.uibox;
 		var inUse = ui.comboSelectedHandle != null;
 		var isEscape = kb.started("escape");
-		if (drawn && (ui.inputReleased || isEscape) && !inUse && !ui.isTyping) {
+		if (draws > 2 && (ui.inputReleased || isEscape) && !inUse && !ui.isTyping) {
 			var appw = System.windowWidth();
 			var apph = System.windowHeight();
 			var mw = Std.int(modalW * ui.SCALE());
@@ -108,7 +108,7 @@ class UIBox {
 		hwnd.dragX = 0;
 		hwnd.dragY = 0;
 		show = true;
-		drawn = false;
+		draws = 0;
 		clickToHide = true;
 	}
 }
diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx
index 7d45d8a1..b23dc917 100644
--- a/Sources/arm/ui/UINodes.hx
+++ b/Sources/arm/ui/UINodes.hx
@@ -258,20 +258,29 @@ class UINodes {
 	public function drawGrid() {
 		var ww = defaultWindowW;
 		var wh = iron.App.h();
-		var w = ww + 40 * 2;
-		var h = wh + 40 * 2;
+		var w = ww + 100 * 2;
+		var h = wh + 100 * 2;
 		if (w < 1) w = 1;
 		if (h < 1) h = 1;
 		grid = Image.createRenderTarget(w, h);
 		grid.g2.begin(true, ui.t.SEPARATOR_COL);
-		for (i in 0...Std.int(h / 40) + 1) {
-			grid.g2.color = ui.t.WINDOW_BG_COL;
-			grid.g2.drawLine(0, i * 40 + 20, w, i * 40 + 20);
+
+		grid.g2.color = ui.t.SEPARATOR_COL - 0x00050505;
+		for (i in 0...Std.int(h / 20) + 1) {
+			grid.g2.drawLine(0, i * 20, w, i * 20);
 		}
-		for (i in 0...Std.int(w / 40) + 1) {
-			grid.g2.color = ui.t.WINDOW_BG_COL;
-			grid.g2.drawLine(i * 40 + 20, 0, i * 40 + 20, h);
+		for (i in 0...Std.int(w / 20) + 1) {
+			grid.g2.drawLine(i * 20, 0, i * 20, h);
 		}
+
+		grid.g2.color = ui.t.SEPARATOR_COL - 0x00090909;
+		for (i in 0...Std.int(h / 100) + 1) {
+			grid.g2.drawLine(0, i * 100, w, i * 100);
+		}
+		for (i in 0...Std.int(w / 100) + 1) {
+			grid.g2.drawLine(i * 100, 0, i * 100, h);
+		}
+
 		grid.g2.end();
 	}
 
@@ -319,7 +328,7 @@ class UINodes {
 			// Grid
 			var nodes = getNodes();
 			ui.g.color = 0xffffffff;
-			ui.g.drawImage(grid, (nodes.panX * nodes.SCALE()) % 40 - 40, (nodes.panY * nodes.SCALE()) % 40 - 40);
+			ui.g.drawImage(grid, (nodes.panX * nodes.SCALE()) % 100 - 100, (nodes.panY * nodes.SCALE()) % 100 - 100);
 
 			// Nodes
 			var c = getCanvas();