From 3d1d6f03f30a1bec464e10c916c5919d8ae03172 Mon Sep 17 00:00:00 2001 From: Mathias Boulay Date: Fri, 13 Oct 2023 22:00:55 +0200 Subject: [PATCH] Fix[controls]: clone swipeable/mouse passthrough --- .../kdt/pojavlaunch/customcontrols/ControlData.java | 10 +++++++--- 1 file changed, 7 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 5f39ec0c2..de03b0e5b 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 @@ -109,10 +109,10 @@ public class ControlData { } public ControlData(String name, int[] keycodes, String dynamicX, String dynamicY, float width, float height, boolean isToggle) { - this(name, keycodes, dynamicX, dynamicY, width, height, isToggle, 1, 0x4D000000, 0xFFFFFFFF, 0, 0, true, true); + this(name, keycodes, dynamicX, dynamicY, width, height, isToggle, 1, 0x4D000000, 0xFFFFFFFF, 0, 0, true, true, false, false); } - public ControlData(String name, int[] keycodes, String dynamicX, String dynamicY, float width, float height, boolean isToggle, float opacity, int bgColor, int strokeColor, float strokeWidth, float cornerRadius, boolean displayInGame, boolean displayInMenu) { + public ControlData(String name, int[] keycodes, String dynamicX, String dynamicY, float width, float height, boolean isToggle, float opacity, int bgColor, int strokeColor, float strokeWidth, float cornerRadius, boolean displayInGame, boolean displayInMenu, boolean isSwipable, boolean mousePassthrough) { this.name = name; this.keycodes = inflateKeycodeArray(keycodes); this.dynamicX = dynamicX; @@ -128,6 +128,8 @@ public class ControlData { this.cornerRadius = cornerRadius; this.displayInGame = displayInGame; this.displayInMenu = displayInMenu; + this.isSwipeable = isSwipable; + this.passThruEnabled = mousePassthrough; } //Deep copy constructor @@ -146,7 +148,9 @@ public class ControlData { controlData.strokeWidth, controlData.cornerRadius, controlData.displayInGame, - controlData.displayInMenu + controlData.displayInMenu, + controlData.isSwipeable, + controlData.passThruEnabled ); }