From a1db9c64045b2fa2196578e47c48d6466ca2b9c2 Mon Sep 17 00:00:00 2001
From: Thierry Geindre <thierry.geindre@bedrockstreaming.com>
Date: Thu, 11 Jan 2024 14:41:49 +0100
Subject: [PATCH] Improve gid fix #1

---
 gui/widget/grid.go | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/gui/widget/grid.go b/gui/widget/grid.go
index 9eca8ce..5e53372 100644
--- a/gui/widget/grid.go
+++ b/gui/widget/grid.go
@@ -86,34 +86,27 @@ func (r *Grid) onChildDrag(c component.IComponent, e event.IEvent) {
 
 func (r *Grid) setComponentPosition(c component.IComponent) {
 	l := c.GetLayout()
-	w, _ := l.GetSize()
-
-	x, y := r.GetLayout().GetAbsolutePosition()
-	mx, my := ebiten.CursorPosition()
-	x, y = x+float64(mx), y+float64(my)
 
 	shiftX := float64(int(r.shiftX) % int(r.cellW))
 	shiftY := float64(int(r.shiftY) % int(r.cellH))
 
-	// Compute cell position where the mouse is inside
-	cx := float64(int(x/r.cellW))*r.cellW + shiftX - w + r.cellW
-	cy := float64(int(y/r.cellH))*r.cellH + shiftY
-
-	if x < cx {
-		cx -= r.cellW
+	x, y := l.GetPosition()
+	if x < 0 {
+		x -= r.cellW / 2
+	} else {
+		x += r.cellW / 2
 	}
-
-	if y < cy {
-		cy -= r.cellH
+	if y < 0 {
+		y -= r.cellH / 2
+	} else {
+		y += r.cellH / 2
 	}
 
-	if y > cy+r.cellH {
-		cy += r.cellH
-	}
+	x -= shiftX
+	y -= shiftY
 
-	if x > cx+r.cellW {
-		cx += r.cellW
-	}
+	cx := float64(int(x/r.cellW))*r.cellW + shiftX
+	cy := float64(int(y/r.cellH))*r.cellH + shiftY
 
 	l.SetPosition(cx, cy)
 }