From 55eddba545e3d285ed66ff529522d9d3ce1caa26 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sat, 30 Jan 2021 05:34:52 +0700
Subject: [PATCH] More fixes

---
 .../java/net/kdt/pojavlaunch/uikit/UIKit.java | 39 ++++++++++---------
 .../java/org/lwjgl/glfw/CallbackBridge.java   |  4 --
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
index 8f48a3f3..85de095e 100644
--- a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
+++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java
@@ -3,44 +3,47 @@ package net.kdt.pojavlaunch.uikit;
 import org.lwjgl.glfw.*;
 
 public class UIKit {
-    static {
-        System.loadLibrary("pojavexec");
-    }
-    
-    public static native int launchUI(String[] uiArgs);
-    public static native void runOnUIThread(UIKitCallback callback);
-    
+    public static final int ACTION_DOWN = 0;
+    public static final int ACTION_UP = 1;
+    public static final int ACTION_MOVE = 2;
     
     public static void callback_AppDelegate_didFinishLaunching(int width, int height) {
-        GLFW.mGLFWWindowWidth = CallbackBridge.width;
-        GLFW.mGLFWWindowHeight = CallbackBridge.height;
-        CallbackBridge.mouseX = CallbackBridge.width / 2;
+        GLFW.mGLFWWindowWidth = width;
+        GLFW.mGLFWWindowHeight = height;
+        CallbackBridge.mouseX = width / 2;
         CallbackBridge.mouseY = height / 2;
         net.kdt.pojavlaunch.PLaunchApp.applicationDidFinishLaunching();
     }
     
     public static void callback_SurfaceViewController_onTouch(int event, int x, int y) {
         switch (event) {
-            case ACTION_DOWN:
-            case ACTION_UP:
+            case CallbackBridge.ACTION_DOWN:
+            case CallbackBridge.ACTION_UP:
                 CallbackBridge.mouseLastX = x;
                 CallbackBridge.mouseLastY = y;
                 break;
                 
-            case ACTION_MOVE:
+            case CallbackBridge.ACTION_MOVE:
                 if (GLFW.mGLFWIsGrabbing) {
                     CallbackBridge.mouseX += x - CallbackBridge.mouseLastX;
                     CallbackBridge.mouseY += y - CallbackBridge.mouseLastY;
                     
-                    CallbackBridge.mouseLastX = CallbackBridge.x;
-                    CallbackBridge.mouseLastY = CallbackBridge.y;
+                    CallbackBridge.mouseLastX = x;
+                    CallbackBridge.mouseLastY = y;
                 } else {
-                    CallbackBridge.mouseX = CallbackBridge.x;
-                    CallbackBridge.mouseY = CallbackBridge.y;
+                    CallbackBridge.mouseX = x;
+                    CallbackBridge.mouseY = y;
                 }
                 break;
         }
         
-        sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
+        CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
     }
+    
+    static {
+        System.loadLibrary("pojavexec");
+    }
+    
+    public static native int launchUI(String[] uiArgs);
+    public static native void runOnUIThread(UIKitCallback callback);
 }
diff --git a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
index 7dd1a13f..0bfb2221 100644
--- a/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+++ b/JavaApp/src/main/java/org/lwjgl/glfw/CallbackBridge.java
@@ -22,10 +22,6 @@ public class CallbackBridge {
     
     public static final int ANDROID_TYPE_GRAB_STATE = 0;
     
-    public static final int ACTION_DOWN = 0;
-    public static final int ACTION_UP = 1;
-    public static final int ACTION_MOVE = 2;
-
     // Should pending events be limited?
     volatile public static List<Integer[]> PENDING_EVENT_LIST = new ArrayList<>();
     volatile public static boolean PENDING_EVENT_READY = false;