From 5de6ba4633e8988b35a092965853b3da41971752 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Tue, 11 May 2021 22:09:45 +0200 Subject: [PATCH] Updated constructors fcontrolData with a default pos to the center --- .../net/kdt/pojavlaunch/customcontrols/ControlData.java | 8 ++++++-- .../kdt/pojavlaunch/customcontrols/ControlDrawerData.java | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java index b6256b160..2e281bc22 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlData.java @@ -84,11 +84,15 @@ public class ControlData implements Cloneable public Object specialButtonListener; public ControlData() { - this("", new int[]{LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN}, 0, 0); + this("button"); + } + + public ControlData(String name){ + this(name, new int[] {}); } public ControlData(String name, int[] keycodes) { - this(name, keycodes, 0, 0); + this(name, keycodes, Tools.currentDisplayMetrics.widthPixels/2, Tools.currentDisplayMetrics.heightPixels/2); } public ControlData(String name, int[] keycodes, float x, float y) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java index 5e3072f66..cdb02339c 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlDrawerData.java @@ -1,5 +1,7 @@ package net.kdt.pojavlaunch.customcontrols; +import net.kdt.pojavlaunch.Tools; + import java.util.ArrayList; import static net.kdt.pojavlaunch.customcontrols.ControlDrawerData.Orientation.DOWN; @@ -57,7 +59,7 @@ public class ControlDrawerData { } public ControlDrawerData(ArrayList buttonProperties){ - this(buttonProperties, new ControlData()); + this(buttonProperties, new ControlData("Drawer", new int[] {}, Tools.currentDisplayMetrics.widthPixels/2, Tools.currentDisplayMetrics.heightPixels/2)); } public ControlDrawerData(ArrayList buttonProperties, ControlData properties){