diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 97987e16b..8ffa8f4cc 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -796,8 +796,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener, sendMouseButton(1, isDown); } else { if (!isDown) { - CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY); - CallbackBridge.sendMouseKeycode(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT); + CallbackBridge.sendMouseEvent(CallbackBridge.mouseX, CallbackBridge.mouseY, LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT); } setRightOverride(isDown); } break; diff --git a/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java index 03653bc1d..87498d65a 100644 --- a/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/app/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -19,6 +19,11 @@ public class CallbackBridge { volatile private static boolean isGrabbing = false; + public static void sendMouseEvent(int x, int y, int keycode) { + sendCursorPos(x, y); + sendMouseKeycode(keycode); + } + public static void sendMouseEvent(int x, int y, int keycode, boolean isDown) { sendCursorPos(x, y); sendMouseKeycode(keycode, isDown); @@ -27,7 +32,7 @@ public class CallbackBridge { public static void sendCursorPos(int x, int y) { DEBUG_STRING.append("CursorPos=" + x + ", " + y + "\n"); mouseX = x; - mouseY = y; + mouseY = windowHeight - y; sendData(JRE_TYPE_CURSOR_POS, x + ":" + y); }