From 1aabb184d30da637fa44f7b8c6f7a099f8767d89 Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Thu, 17 Jun 2021 13:36:23 +0200
Subject: [PATCH] The speed of gamepad cursor is now res independent.

---
 .../kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
index 12c390beb..aa37f16ea 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
@@ -127,16 +127,15 @@ public class Gamepad {
         //Initialize runnables to be used by the input system, avoiding generating one each time is better memory.
         mouseRunnable = () -> CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y);
         switchStateRunnable = () -> {
+            currentMap.resetPressedState();
             if(lastGrabbingState){
                 currentMap = gameMap;
-                menuMap.resetPressedState();
                 pointerView.setVisibility(View.INVISIBLE);
-                mouseSensitivity = 19;
+                mouseSensitivity = 26 / gameActivity.sensitivityFactor; //sensitivity in menus is resolution dependent.
                 return;
             }
 
             currentMap = menuMap;
-            gameMap.resetPressedState();
             sendDirectionalKeycode(currentJoystickDirection, false, gameMap); // removing what we were doing
 
             gameActivity.mouse_x = CallbackBridge.windowWidth/2;
@@ -144,7 +143,7 @@ public class Gamepad {
             CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y);
             placePointerView(CallbackBridge.physicalWidth/2, CallbackBridge.physicalHeight/2);
             pointerView.setVisibility(View.VISIBLE);
-            mouseSensitivity = 15;
+            mouseSensitivity = 15; //sensitivity in game doesn't need to be resolution dependent
         };
     }