mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-13 06:39:54 -04:00
Fix[controls]: clone swipeable/mouse passthrough
This commit is contained in:
parent
f3c19895a0
commit
3d1d6f03f3
@ -109,10 +109,10 @@ public class ControlData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ControlData(String name, int[] keycodes, String dynamicX, String dynamicY, float width, float height, boolean isToggle) {
|
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.name = name;
|
||||||
this.keycodes = inflateKeycodeArray(keycodes);
|
this.keycodes = inflateKeycodeArray(keycodes);
|
||||||
this.dynamicX = dynamicX;
|
this.dynamicX = dynamicX;
|
||||||
@ -128,6 +128,8 @@ public class ControlData {
|
|||||||
this.cornerRadius = cornerRadius;
|
this.cornerRadius = cornerRadius;
|
||||||
this.displayInGame = displayInGame;
|
this.displayInGame = displayInGame;
|
||||||
this.displayInMenu = displayInMenu;
|
this.displayInMenu = displayInMenu;
|
||||||
|
this.isSwipeable = isSwipable;
|
||||||
|
this.passThruEnabled = mousePassthrough;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Deep copy constructor
|
//Deep copy constructor
|
||||||
@ -146,7 +148,9 @@ public class ControlData {
|
|||||||
controlData.strokeWidth,
|
controlData.strokeWidth,
|
||||||
controlData.cornerRadius,
|
controlData.cornerRadius,
|
||||||
controlData.displayInGame,
|
controlData.displayInGame,
|
||||||
controlData.displayInMenu
|
controlData.displayInMenu,
|
||||||
|
controlData.isSwipeable,
|
||||||
|
controlData.passThruEnabled
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user