From 3fda06b701bf31aff820ee16273b6ce4a0f11ce1 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Wed, 24 Apr 2024 17:21:53 +0100
Subject: [PATCH] ctrlpad: improve hit-test

---
 apps/ctrlpad/wid.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/ctrlpad/wid.ts b/apps/ctrlpad/wid.ts
index 95aa2b861..2ecff6428 100644
--- a/apps/ctrlpad/wid.ts
+++ b/apps/ctrlpad/wid.ts
@@ -118,13 +118,20 @@
 		}
 
 		hitTest(x: number, y: number): Control | undefined {
-			const radius = 25;
+			let dist = Infinity;
+			let closest;
 
-			for(const ctrl of this.controls)
-				if(Math.abs(y - ctrl.y) < radius && Math.abs(x - ctrl.x) < radius)
-					return ctrl;
+			for(const ctrl of this.controls){
+				const dx = x-ctrl.x;
+				const dy = y-ctrl.y;
+				const d = Math.sqrt(dx*dx + dy*dy);
+				if(d < dist){
+					dist = d;
+					closest = ctrl;
+				}
+			}
 
-			return undefined;
+			return dist < 30 ? closest : undefined;
 		}
 	}