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

[Custom controls] Special buttons fix; Fix key index

Browse Source
This commit is contained in:
khanhduytran0 2020-11-17 18:58:42 +07:00
parent 54341d7cfe
commit 9e6fbfd2d7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/kdt/handleview/ActionPopupWindow.java
View File

@ -147,7 +147,7 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
if (properties.keycode < 0) { if (properties.keycode < 0) {
spinnerKeycode.setSelection(properties.keycode + 5); spinnerKeycode.setSelection(properties.keycode + 5);
} else { } else {
spinnerKeycode.setSelection(AndroidLWJGLKeycode.getIndexByLWJGLKey(properties.keycode + 2)); spinnerKeycode.setSelection(AndroidLWJGLKeycode.getIndexByLWJGLKey(properties.keycode + 5));
} }
spinnerKeycode.setOnItemSelectedListener(new Spinner.OnItemSelectedListener(){ spinnerKeycode.setOnItemSelectedListener(new Spinner.OnItemSelectedListener(){
@ -173,7 +173,7 @@ public class ActionPopupWindow extends PinnedPopupWindow implements OnClickListe
if (editName.getText().toString().isEmpty()) { if (editName.getText().toString().isEmpty()) {
editName.setError(view.getResources().getString(R.string.global_error_field_empty)); editName.setError(view.getResources().getString(R.string.global_error_field_empty));
} else { } else {
properties.keycode = AndroidLWJGLKeycode.getKeyIndex(spinnerKeycode.getSelectedItemPosition()) - 2; properties.keycode = AndroidLWJGLKeycode.getKeyIndex(spinnerKeycode.getSelectedItemPosition()) - 5;
properties.name = editName.getText().toString(); properties.name = editName.getText().toString();
properties.hidden = checkHidden.isChecked(); properties.hidden = checkHidden.isChecked();

4
app/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java
View File

@ -93,6 +93,10 @@ public class ControlData implements Cloneable
} }
public ControlData clone() { public ControlData clone() {
if (this instanceof DynamicControlData) {
return new DynamicControlData(name, keycode, ((DynamicControlData) this).dynamicX, ((DynamicControlData) this).dynamicY, width, height);
} else {
return new ControlData(name, keycode, x, y, width, height); return new ControlData(name, keycode, x, y, width, height);
} }
} }
}

2
app/src/main/java/net/kdt/pojavlaunch/customcontrols/DynamicControlData.java
View File

@ -16,7 +16,7 @@ public class DynamicControlData extends ControlData {
* bigger device or vice versa. * bigger device or vice versa.
*/ */
private String dynamicX, dynamicY; public String dynamicX, dynamicY;
public DynamicControlData() { public DynamicControlData() {
this("", LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN); this("", LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN);