From 59bc3764dd50073ec6b7b0a99dc6354a04cbe99c Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Fri, 23 Jul 2021 11:12:00 +0200 Subject: [PATCH] Moved the setModifiers to the CallbackBridge --- .../customcontrols/buttons/ControlButton.java | 24 +------------------ .../java/org/lwjgl/glfw/CallbackBridge.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java index 239966587..1f4ca2d64 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java @@ -133,29 +133,7 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp ((ControlLayout) getParent()).setModified(modified); } - private void setHolding(int keyCode, boolean isDown){ - switch (keyCode){ - case LWJGLGLFWKeycode.GLFW_KEY_LEFT_SHIFT: - CallbackBridge.holdingShift = isDown; - return; - case LWJGLGLFWKeycode.GLFW_KEY_LEFT_CONTROL: - CallbackBridge.holdingCtrl = isDown; - return; - - case LWJGLGLFWKeycode.GLFW_KEY_LEFT_ALT: - CallbackBridge.holdingAlt = isDown; - return; - - case LWJGLGLFWKeycode.GLFW_KEY_CAPS_LOCK: - CallbackBridge.holdingCapslock = isDown; - return; - - case LWJGLGLFWKeycode.GLFW_KEY_NUM_LOCK: - CallbackBridge.holdingNumlock = isDown; - return; - } - } @Override public void setLayoutParams(ViewGroup.LayoutParams params) { @@ -353,7 +331,7 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp for(int keycode : mProperties.keycodes){ if(keycode >= GLFW_KEY_UNKNOWN){ MainActivity.sendKeyPress(keycode, CallbackBridge.getCurrentMods(), isDown); - setHolding(keycode, isDown); + CallbackBridge.setModifiers(keycode, isDown); }else { super.onTouchEvent(event); } diff --git a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java index b474e737d..94111f036 100644 --- a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -166,6 +166,30 @@ public class CallbackBridge { return currMods; } + public static void setModifiers(int keyCode, boolean isDown){ + switch (keyCode){ + case LWJGLGLFWKeycode.GLFW_KEY_LEFT_SHIFT: + CallbackBridge.holdingShift = isDown; + return; + + case LWJGLGLFWKeycode.GLFW_KEY_LEFT_CONTROL: + CallbackBridge.holdingCtrl = isDown; + return; + + case LWJGLGLFWKeycode.GLFW_KEY_LEFT_ALT: + CallbackBridge.holdingAlt = isDown; + return; + + case LWJGLGLFWKeycode.GLFW_KEY_CAPS_LOCK: + CallbackBridge.holdingCapslock = isDown; + return; + + case LWJGLGLFWKeycode.GLFW_KEY_NUM_LOCK: + CallbackBridge.holdingNumlock = isDown; + return; + } + } + public static native boolean nativeAttachThreadToOther(boolean isAndroid, boolean isUsePushPoll); private static native boolean nativeSendChar(char codepoint);