From 41caff9de4869af572bbe487934dc5857aae9b3c Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Tue, 2 Feb 2021 06:45:18 +0700 Subject: [PATCH] Try to fix cursor pos not correctly --- .../src/main/java/org/lwjgl/glfw/CallbackBridge.java | 4 ++-- JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java index 0bfb2221..12ae4e2b 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -49,8 +49,8 @@ public class CallbackBridge { private static void nativeSendCursorPos(int x, int y) { if (!inputReady) return; - GLFW.mGLFWCursorX = x; - GLFW.mGLFWCursorY = y; + GLFW.mGLFWCursorX = x + GLFW.internalGetWindow(window).x; + GLFW.mGLFWCursorY = y + GLFW.internalGetWindow(window).y; } private static void nativeSendKeycode(int keycode, char keychar, int scancode, int action, int mods) { if (!inputReady) return; diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java index 295ea5c8..7f4b2dda 100644 --- a/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java @@ -1000,15 +1000,8 @@ public class GLFW } public static void glfwSetWindowPos(long window, int x, int y) { - // internalGetWindow(window).x = x; - // internalGetWindow(window).y = y; - - internalGetWindow(window).x = 0; - internalGetWindow(window).y = 0; - - if (x != 0 || y != 0) { - mGLFWWindowPosCallback.invoke(window, 0, 0); - } + internalGetWindow(window).x = x; + internalGetWindow(window).y = y; } public static void glfwSetWindowSize(long window, int width, int height) {