mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-23 02:57:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Proper clamping of button position

Browse Source
This commit is contained in:
SerpentSpirale
2021-07-29 14:43:40 +02:00
committed by ArtDev
parent 0ec697e1ac
commit 6ec0dfbbed
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlButton.java
View File

@@ -8,7 +8,9 @@ import android.view.*;
import android.view.View.*;
import android.widget.*;
import com.google.android.material.math.MathUtils;
import androidx.core.math.MathUtils;
import net.kdt.pojavlaunch.customcontrols.ControlData;
import net.kdt.pojavlaunch.customcontrols.ControlLayout;
@@ -312,7 +314,10 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
mCanTriggerLongClick = false;
if (!mProperties.isDynamicBtn) {
snapAndAlign(event.getRawX() - downX, event.getRawY() - downY);
snapAndAlign(
MathUtils.clamp(event.getRawX() - downX, 0, CallbackBridge.physicalWidth - getWidth()),
MathUtils.clamp(event.getRawY() - downY, 0, CallbackBridge.physicalHeight - getHeight())
);
}
break;
}
@@ -338,7 +343,8 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
for(ControlButton button : ((ControlLayout) getParent()).getButtonChildren()){
//Step 1: Filter unwanted buttons
if(button == this) continue;
if(MathUtils.dist(button.getX() + button.getWidth()/2f,
if(com.google.android.material.math.MathUtils.dist(
button.getX() + button.getWidth()/2f,
button.getY() + button.getHeight()/2f,
getX() + getWidth()/2f,
getY() + getHeight()/2f) > Math.max(button.getWidth()/2f + getWidth()/2f, button.getHeight()/2f + getHeight()/2f) + MIN_DISTANCE) continue;
@@ -373,7 +379,7 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
}else if(Math.abs(left - button_right) < MIN_DISTANCE){ //Right snap
x = button_right;
}
if(x != getX()){
if(x != getX()){ //If we snapped
if(Math.abs(button_top - top) < MIN_DISTANCE){ //Top align snap
y = button_top;
}else if(Math.abs(button_bottom - bottom) < MIN_DISTANCE){ //Bottom align snap