From 9829dc436bec60490b95af575f1bda95b50f0d81 Mon Sep 17 00:00:00 2001 From: Mathias-Boulay Date: Mon, 15 May 2023 22:26:23 +0200 Subject: [PATCH] Workaround[controls]: disable view clipping in game This is only for the joystick, no other view should be affected --- app_pojavlauncher/build.gradle | 4 ++-- .../net/kdt/pojavlaunch/customcontrols/ControlLayout.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index 457511fbd..87fe87723 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -186,8 +186,8 @@ dependencies { implementation 'com.github.PojavLauncherTeam:portrait-sdp:ed33e89cbc' implementation 'com.github.PojavLauncherTeam:portrait-ssp:6c02fd739b' implementation 'com.github.Mathias-Boulay:ExtendedView:1.0.0' - implementation 'com.github.Mathias-Boulay:android_gamepad_remapper:eb92e3a5bb' - implementation 'com.github.Mathias-Boulay:virtual-joystick-android:3832b4f94a' + implementation 'com.github.Mathias-Boulay:android_gamepad_remapper:9c4e285ce8' + implementation 'com.github.Mathias-Boulay:virtual-joystick-android:4fee901b58' // implementation 'com.intuit.sdp:sdp-android:1.0.5' diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java index 98a5d3638..c000bfc7f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/ControlLayout.java @@ -60,10 +60,12 @@ public class ControlLayout extends FrameLayout { public ControlLayout(Context ctx) { super(ctx); + setClipChildren(false); } public ControlLayout(Context ctx, AttributeSet attrs) { super(ctx, attrs); + setClipChildren(false); } @@ -243,6 +245,9 @@ public class ControlLayout extends FrameLayout { } public void setModifiable(boolean isModifiable) { + // Hack to allow joystick free placement and resize while seeing the forward lock + setClipChildren(isModifiable); + if(!isModifiable && mModifiable){ removeEditWindow(); }