From c9930d10f99961683db078fdba67e3e6b95461fa Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Sun, 13 Jul 2025 11:23:59 -0700
Subject: [PATCH] Refine gamepad touch controls (#591)

---
 .../lego/legoomni/include/legoinputmanager.h  |  2 +-
 .../legoomni/src/input/legoinputmanager.cpp   | 36 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoinputmanager.h b/LEGO1/lego/legoomni/include/legoinputmanager.h
index 30170822..3d17df56 100644
--- a/LEGO1/lego/legoomni/include/legoinputmanager.h
+++ b/LEGO1/lego/legoomni/include/legoinputmanager.h
@@ -183,7 +183,7 @@ class LegoInputManager : public MxPresenter {
 
 	std::map<SDL_FingerID, SDL_FPoint> m_touchOrigins;
 	std::map<SDL_FingerID, MxU32> m_touchFlags;
-	std::map<SDL_FingerID, Uint64> m_touchLastMotion;
+	std::map<SDL_FingerID, std::pair<MxU32, SDL_FPoint>> m_touchLastMotion;
 };
 
 // TEMPLATE: LEGO1 0x10028850
diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
index ddcadaae..b0eae128 100644
--- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
+++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp
@@ -532,9 +532,14 @@ MxResult LegoInputManager::GetNavigationTouchStates(MxU32& p_keyStates)
 		p_keyStates |= touchFlags;
 
 		// We need to clear these as they are not meant to be persistent in e_gamepad mode.
-		if (m_touchOrigins.count(fingerID) && SDL_GetTicks() - m_touchLastMotion[fingerID] > 5) {
-			touchFlags &= ~c_left;
-			touchFlags &= ~c_right;
+		if (m_touchOrigins.count(fingerID) && m_touchLastMotion.count(fingerID)) {
+			const MxU32 inactivityThreshold = 3;
+
+			if (m_touchLastMotion[fingerID].first++ > inactivityThreshold) {
+				touchFlags &= ~c_left;
+				touchFlags &= ~c_right;
+				m_touchOrigins[fingerID].x = m_touchLastMotion[fingerID].second.x;
+			}
 		}
 	}
 
@@ -586,12 +591,11 @@ MxBool LegoInputManager::HandleTouchEvent(SDL_Event* p_event, TouchScheme p_touc
 			break;
 		case SDL_EVENT_FINGER_MOTION:
 			if (m_touchOrigins.count(event.fingerID)) {
-				m_touchFlags[event.fingerID] = 0;
-				m_touchLastMotion[event.fingerID] = SDL_GetTicks();
+				const float activationThreshold = 0.03f;
+				m_touchFlags[event.fingerID] &= ~c_down;
+				m_touchFlags[event.fingerID] &= ~c_up;
 
 				const float deltaY = event.y - m_touchOrigins[event.fingerID].y;
-				const float activationThreshold = 0.05f;
-
 				if (SDL_fabsf(deltaY) > activationThreshold) {
 					if (deltaY > 0) {
 						m_touchFlags[event.fingerID] |= c_down;
@@ -601,12 +605,18 @@ MxBool LegoInputManager::HandleTouchEvent(SDL_Event* p_event, TouchScheme p_touc
 					}
 				}
 
-				const float deltaX = event.dx;
-				if (deltaX > 0) {
-					m_touchFlags[event.fingerID] |= c_right;
-				}
-				else if (deltaX < 0) {
-					m_touchFlags[event.fingerID] |= c_left;
+				const float deltaX = event.x - m_touchOrigins[event.fingerID].x;
+				if (SDL_fabsf(deltaX) > activationThreshold && event.dx) {
+					if (event.dx > 0) {
+						m_touchFlags[event.fingerID] |= c_right;
+						m_touchFlags[event.fingerID] &= ~c_left;
+					}
+					else if (event.dx < 0) {
+						m_touchFlags[event.fingerID] |= c_left;
+						m_touchFlags[event.fingerID] &= ~c_right;
+					}
+
+					m_touchLastMotion[event.fingerID] = {0, {event.x, event.y}};
 				}
 			}
 			break;