From 2fee70d77c50b72d920100e295825f30d0c2468d Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Mon, 26 Jul 2021 20:00:48 +0200 Subject: [PATCH] Buttons cannot be moved out of the screen anymore --- .../pojavlaunch/customcontrols/buttons/ControlButton.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java index b23130ed3..8a10af8cb 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java @@ -8,6 +8,8 @@ import android.view.*; import android.view.View.*; import android.widget.*; +import androidx.core.math.MathUtils; + import net.kdt.pojavlaunch.customcontrols.ControlData; import net.kdt.pojavlaunch.customcontrols.ControlLayout; import net.kdt.pojavlaunch.customcontrols.handleview.*; @@ -304,8 +306,8 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp mCanTriggerLongClick = false; if (!mProperties.isDynamicBtn) { - setX(event.getRawX() - downX); - setY(event.getRawY() - downY); + setX(MathUtils.clamp(event.getRawX() - downX,0, CallbackBridge.physicalWidth)); + setY(MathUtils.clamp(event.getRawY() - downY, 0, CallbackBridge.physicalHeight)); } break; }