TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 00:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update MainActivity to support new properties

Browse Source
This commit is contained in:
SerpentSpirale 2021-04-21 09:25:28 +02:00
parent fdddabd1c7
commit 8fa12e2d76
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -37,7 +37,7 @@ public class MainActivity extends BaseMainActivity {
CustomControlsActivity.load(mControlLayout); CustomControlsActivity.load(mControlLayout);
break; break;
case R.id.menu_ctrl_add: case R.id.menu_ctrl_add:
mControlLayout.addControlButton(new ControlData("New", LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN, 100, 100)); mControlLayout.addControlButton(new ControlData("New", new int[] {LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN}, 100, 100));
break; break;
case R.id.menu_ctrl_selectdefault: case R.id.menu_ctrl_selectdefault:
CustomControlsActivity.dialogSelectDefaultCtrl(mControlLayout); CustomControlsActivity.dialogSelectDefaultCtrl(mControlLayout);
@ -56,18 +56,20 @@ public class MainActivity extends BaseMainActivity {
public void onClick(View view) { public void onClick(View view) {
if (view instanceof ControlButton) { if (view instanceof ControlButton) {
ControlButton button = (ControlButton) view; ControlButton button = (ControlButton) view;
switch (button.getProperties().keycode) { for(int keycode : button.getProperties().keycodes){
case ControlData.SPECIALBTN_KEYBOARD: switch (keycode) {
showKeyboard(); case ControlData.SPECIALBTN_KEYBOARD:
break; showKeyboard();
break;
case ControlData.SPECIALBTN_TOGGLECTRL: case ControlData.SPECIALBTN_TOGGLECTRL:
mControlLayout.toggleControlVisible(); mControlLayout.toggleControlVisible();
break; break;
case ControlData.SPECIALBTN_VIRTUALMOUSE: case ControlData.SPECIALBTN_VIRTUALMOUSE:
toggleMouse(button); toggleMouse(button);
break; break;
}
} }
} }
} }
@ -93,32 +95,34 @@ public class MainActivity extends BaseMainActivity {
if (view instanceof ControlButton) { if (view instanceof ControlButton) {
ControlButton button = (ControlButton) view; ControlButton button = (ControlButton) view;
switch (button.getProperties().keycode) { for(int keycode : button.getProperties().keycodes) {
case ControlData.SPECIALBTN_MOUSEPRI: switch (keycode) {
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown); case ControlData.SPECIALBTN_MOUSEPRI:
break; sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, isDown);
break;
case ControlData.SPECIALBTN_MOUSEMID: case ControlData.SPECIALBTN_MOUSEMID:
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_MIDDLE, isDown); sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_MIDDLE, isDown);
break; break;
case ControlData.SPECIALBTN_MOUSESEC: case ControlData.SPECIALBTN_MOUSESEC:
if (CallbackBridge.isGrabbing()) { if (CallbackBridge.isGrabbing()) {
sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown);
} else { } else {
CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown ? 1 : 0, CallbackBridge.mouseX, CallbackBridge.mouseY); CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown ? 1 : 0, CallbackBridge.mouseX, CallbackBridge.mouseY);
setRightOverride(isDown); setRightOverride(isDown);
} }
break; break;
case ControlData.SPECIALBTN_SCROLLDOWN: case ControlData.SPECIALBTN_SCROLLDOWN:
if(!isDown)CallbackBridge.sendScroll(0, 1d); if (!isDown) CallbackBridge.sendScroll(0, 1d);
break; break;
case ControlData.SPECIALBTN_SCROLLUP: case ControlData.SPECIALBTN_SCROLLUP:
if(!isDown)CallbackBridge.sendScroll(0, -1d); if (!isDown) CallbackBridge.sendScroll(0, -1d);
break; break;
}
} }
} }