From fa8ea98eeb3be90fd183b813233c86f9457a4d98 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Sun, 17 Nov 2019 17:42:28 +0100
Subject: [PATCH] Use brush ruler to draw lines

---
 Sources/arm/node/brush/BrushOutputNode.hx | 3 ++-
 Sources/arm/ui/UITrait.hx                 | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Sources/arm/node/brush/BrushOutputNode.hx b/Sources/arm/node/brush/BrushOutputNode.hx
index 298ecc64..7cac75e1 100644
--- a/Sources/arm/node/brush/BrushOutputNode.hx
+++ b/Sources/arm/node/brush/BrushOutputNode.hx
@@ -60,9 +60,10 @@ class BrushOutputNode extends LogicNode {
 			!arm.App.isResizing &&
 			@:privateAccess UITrait.inst.ui.comboSelectedHandle == null &&
 			@:privateAccess UIView2D.inst.ui.comboSelectedHandle == null) { // Header combos are in use
+
 			// Set color pick
 			var down = iron.system.Input.getMouse().down() || iron.system.Input.getPen().down();
-			if (Context.tool == ToolColorId && Project.assets.length > 0 && down) {
+			if (down && Context.tool == ToolColorId && Project.assets.length > 0) {
 				UITrait.inst.colorIdPicked = true;
 			}
 			// Prevent painting the same spot
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index d4d9582e..3be97c1e 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -657,6 +657,13 @@ class UITrait {
 						!App.isDragging &&
 						!App.isResizing &&
 						@:privateAccess ui.comboSelectedHandle == null) { // Paint started
+
+						// Draw line
+						if (Operator.shortcut(Config.keymap.brush_ruler + "+" + Config.keymap.action_paint)) {
+							lastPaintVecX = lastPaintX;
+							lastPaintVecY = lastPaintY;
+						}
+
 						History.pushUndo = true;
 						if (Context.tool == ToolClone && cloneStartX >= 0.0) { // Clone delta
 							cloneDeltaX = (cloneStartX - mx) / iron.App.w();