From a4a1b058421e0423938e5b34eefac759e9f65211 Mon Sep 17 00:00:00 2001 From: iota97 Date: Wed, 1 Apr 2020 11:34:54 +0200 Subject: [PATCH] Touch layout clean up --- UI/TouchControlLayoutScreen.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index e7f30bb219..c970b0f1c0 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -264,15 +264,9 @@ bool TouchControlLayoutScreen::touch(const TouchInput &touch) { validRange.y += bounds.h * 0.5f; validRange.h -= bounds.h; - // Check x and y independently, since even if x is blocked, y may not be. - if (validRange.Contains(touch.x, newPos.y) || validRange.Contains(touch.x, touch.y)) { - newPos.x = touch.x; - } - if (validRange.Contains(newPos.x, touch.y) || validRange.Contains(touch.x, touch.y)) { - newPos.y = touch.y; - } + newPos.x = touch.x; + newPos.y = touch.y; if (g_Config.bTouchSnapToGrid) { - newPos = ClampTo(newPos, validRange); newPos.x -= (int)(newPos.x - bounds.w) % g_Config.iTouchSnapGridSize; newPos.y -= (int)(newPos.y - bounds.h) % g_Config.iTouchSnapGridSize; }