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

More direct PX obtaining, now buttons are creatable again!

Browse Source
This commit is contained in:
artdeell 2021-01-04 21:33:40 +03:00
parent 5b2c191b09
commit 2ce3bb4b76
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -210,7 +210,6 @@ public class BaseMainActivity extends LoggableActivity {
this.debugText = findViewById(R.id.content_text_debug); this.debugText = findViewById(R.id.content_text_debug);
this.minecraftGLView = findViewById(R.id.main_game_render_view); this.minecraftGLView = findViewById(R.id.main_game_render_view);
// toggleGui(null); // toggleGui(null);
this.drawerLayout.closeDrawers(); this.drawerLayout.closeDrawers();
/* /*

3
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -62,11 +62,12 @@ public class PojavLoginActivity extends BaseActivity
super.onCreate(savedInstanceState); // false); super.onCreate(savedInstanceState); // false);
Tools.updateWindowSize(this); Tools.updateWindowSize(this);
/*
ControlData.pixelOf2dp = (int) Tools.dpToPx(2); ControlData.pixelOf2dp = (int) Tools.dpToPx(2);
ControlData.pixelOf30dp = (int) Tools.dpToPx(30); ControlData.pixelOf30dp = (int) Tools.dpToPx(30);
ControlData.pixelOf50dp = (int) Tools.dpToPx(50); ControlData.pixelOf50dp = (int) Tools.dpToPx(50);
ControlData.pixelOf80dp = (int) Tools.dpToPx(80); ControlData.pixelOf80dp = (int) Tools.dpToPx(80);
*/
ControlData[] specialButtons = ControlData.getSpecialButtons(); ControlData[] specialButtons = ControlData.getSpecialButtons();
specialButtons[0].name = getString(R.string.control_keyboard); specialButtons[0].name = getString(R.string.control_keyboard);
specialButtons[1].name = getString(R.string.control_toggle); specialButtons[1].name = getString(R.string.control_toggle);

23
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java
View File

@ -9,11 +9,12 @@ import org.lwjgl.glfw.*;
public class ControlData implements Cloneable public class ControlData implements Cloneable
{ {
public static int pixelOf2dp; /*
public static int pixelOf30dp; public static int pixelOf2dp = (int) Tools.dpToPx(2);
public static int pixelOf50dp; public static int pixelOf30dp = (int) Tools.dpToPx(30);
public static int pixelOf50dp = Tools.dpToPx(50);;
public static int pixelOf80dp; public static int pixelOf80dp;
*/
public static final int SPECIALBTN_KEYBOARD = -1; public static final int SPECIALBTN_KEYBOARD = -1;
public static final int SPECIALBTN_TOGGLECTRL = -2; public static final int SPECIALBTN_TOGGLECTRL = -2;
public static final int SPECIALBTN_MOUSEPRI = -3; public static final int SPECIALBTN_MOUSEPRI = -3;
@ -73,8 +74,8 @@ public class ControlData implements Cloneable
public String name; public String name;
public float x; public float x;
public float y; public float y;
public float width = pixelOf50dp; public float width;
public float height = pixelOf50dp; public float height;
public int keycode; public int keycode;
public int transparency; public int transparency;
@Deprecated @Deprecated
@ -93,7 +94,7 @@ public class ControlData implements Cloneable
} }
public ControlData(String name, int keycode, float x, float y) { public ControlData(String name, int keycode, float x, float y) {
this(name, keycode, x, y, pixelOf50dp, pixelOf50dp); this(name, keycode, x, y, Tools.dpToPx(50), Tools.dpToPx(50));
} }
public ControlData(android.content.Context ctx, int resId, int keycode, float x, float y, boolean isSquare) { public ControlData(android.content.Context ctx, int resId, int keycode, float x, float y, boolean isSquare) {
@ -101,7 +102,7 @@ public class ControlData implements Cloneable
} }
public ControlData(String name, int keycode, float x, float y, boolean isSquare) { public ControlData(String name, int keycode, float x, float y, boolean isSquare) {
this(name, keycode, x, y, isSquare ? pixelOf50dp : pixelOf80dp, isSquare ? pixelOf50dp : pixelOf30dp); this(name, keycode, x, y, isSquare ? Tools.dpToPx(50) : Tools.dpToPx(80), isSquare ? Tools.dpToPx(50) : Tools.dpToPx(30));
} }
public ControlData(String name, int keycode, float x, float y, float width, float height) { public ControlData(String name, int keycode, float x, float y, float width, float height) {
@ -110,7 +111,7 @@ public class ControlData implements Cloneable
} }
public ControlData(String name, int keycode, String dynamicX, String dynamicY) { public ControlData(String name, int keycode, String dynamicX, String dynamicY) {
this(name, keycode, dynamicX, dynamicY, pixelOf50dp, pixelOf50dp, false); this(name, keycode, dynamicX, dynamicY, Tools.dpToPx(50), Tools.dpToPx(50), false);
} }
public ControlData(android.content.Context ctx, int resId, int keycode, String dynamicX, String dynamicY, boolean isSquare) { public ControlData(android.content.Context ctx, int resId, int keycode, String dynamicX, String dynamicY, boolean isSquare) {
@ -118,7 +119,7 @@ public class ControlData implements Cloneable
} }
public ControlData(String name, int keycode, String dynamicX, String dynamicY, boolean isSquare) { public ControlData(String name, int keycode, String dynamicX, String dynamicY, boolean isSquare) {
this(name, keycode, dynamicX, dynamicY, isSquare ? pixelOf50dp : pixelOf80dp, isSquare ? pixelOf50dp : pixelOf30dp, false); this(name, keycode, dynamicX, dynamicY, isSquare ? Tools.dpToPx(50) : Tools.dpToPx(80), isSquare ? Tools.dpToPx(50) : Tools.dpToPx(30), false);
} }
public ControlData(String name, int keycode, String dynamicX, String dynamicY, float width, float height, boolean isToggle) { public ControlData(String name, int keycode, String dynamicX, String dynamicY, float width, float height, boolean isToggle) {
@ -156,7 +157,7 @@ public class ControlData implements Cloneable
keyValueMap.put("height", Float.toString(height)); keyValueMap.put("height", Float.toString(height));
keyValueMap.put("screen_width", Integer.toString(CallbackBridge.windowWidth)); keyValueMap.put("screen_width", Integer.toString(CallbackBridge.windowWidth));
keyValueMap.put("screen_height", Integer.toString(CallbackBridge.windowHeight)); keyValueMap.put("screen_height", Integer.toString(CallbackBridge.windowHeight));
keyValueMap.put("margin", Integer.toString(pixelOf2dp)); keyValueMap.put("margin", Integer.toString((int) Tools.dpToPx(2)));
// Insert value to ${variable} // Insert value to ${variable}
String insertedPos = JSONUtils.insertSingleJSONValue(dynamicPos, keyValueMap); String insertedPos = JSONUtils.insertSingleJSONValue(dynamicPos, keyValueMap);