TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 08:05:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix no dynamic alignement.

Browse Source 
Clean up code
This commit is contained in:
SerpentSpirale 2021-07-30 16:55:54 +02:00 committed by ArtDev
parent 1063cabe61
commit ba01daae1a
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,42 +400,29 @@ public class ControlButton extends androidx.appcompat.widget.AppCompatButton imp
float left = getX(); float left = getX();
float right = getX() + getWidth(); float right = getX() + getWidth();
//For context aware snapping
boolean atTopArea = button.getY() + getHeight()/2 < CallbackBridge.physicalHeight/2;
boolean atLeftArea = button.getX() + getWidth()/2 < CallbackBridge.physicalWidth/2;
//Step 3: For each axis, we try to snap to the nearest //Step 3: For each axis, we try to snap to the nearest
if(Math.abs(top - button_bottom) < MIN_DISTANCE){ // Bottom snap if(Math.abs(top - button_bottom) < MIN_DISTANCE){ // Bottom snap
//y = button_bottom;
dynamicY = applySize(button.getProperties().dynamicY, button) + applySize(" + ${height}", button) ; dynamicY = applySize(button.getProperties().dynamicY, button) + applySize(" + ${height}", button) ;
}else if(Math.abs(button_top - bottom) < MIN_DISTANCE){ //Top snap }else if(Math.abs(button_top - bottom) < MIN_DISTANCE){ //Top snap
//y = button_top - getHeight();
dynamicY = applySize(button.getProperties().dynamicY, button) + " - ${height}"; dynamicY = applySize(button.getProperties().dynamicY, button) + " - ${height}";
} }
if(y != getY()){ //If we snapped if(!dynamicY.equals(generateDynamicY(getY()))){ //If we snapped
if(Math.abs(button_left - left) < MIN_DISTANCE){ //Left align snap if(Math.abs(button_left - left) < MIN_DISTANCE){ //Left align snap
//x = button_left;
dynamicX = applySize(button.getProperties().dynamicX, button); dynamicX = applySize(button.getProperties().dynamicX, button);
}else if(Math.abs(button_right - right) < MIN_DISTANCE){ //Right align snap }else if(Math.abs(button_right - right) < MIN_DISTANCE){ //Right align snap
//x = button_right - getWidth();
dynamicX = applySize(button.getProperties().dynamicX, button) + applySize(" + ${width}", button) + " - ${width}"; dynamicX = applySize(button.getProperties().dynamicX, button) + applySize(" + ${width}", button) + " - ${width}";
} }
} }
if(Math.abs(button_left - right) < MIN_DISTANCE){ //Left snap if(Math.abs(button_left - right) < MIN_DISTANCE){ //Left snap
//x = button_left - getWidth();
dynamicX = applySize(button.getProperties().dynamicX, button) + " - ${width}"; dynamicX = applySize(button.getProperties().dynamicX, button) + " - ${width}";
}else if(Math.abs(left - button_right) < MIN_DISTANCE){ //Right snap }else if(Math.abs(left - button_right) < MIN_DISTANCE){ //Right snap
//x = button_right;
dynamicX = applySize(button.getProperties().dynamicX, button) + applySize(" + ${width}", button); dynamicX = applySize(button.getProperties().dynamicX, button) + applySize(" + ${width}", button);
} }
if(x != getX()){ //If we snapped if(!dynamicX.equals(generateDynamicX(getX()))){ //If we snapped
if(Math.abs(button_top - top) < MIN_DISTANCE){ //Top align snap if(Math.abs(button_top - top) < MIN_DISTANCE){ //Top align snap
//y = button_top;
dynamicY = applySize(button.getProperties().dynamicY, button); dynamicY = applySize(button.getProperties().dynamicY, button);
}else if(Math.abs(button_bottom - bottom) < MIN_DISTANCE){ //Bottom align snap }else if(Math.abs(button_bottom - bottom) < MIN_DISTANCE){ //Bottom align snap
//y = button_bottom - getHeight();
dynamicY = applySize(button.getProperties().dynamicY, button) + applySize(" + ${height}", button) + " - ${height}"; dynamicY = applySize(button.getProperties().dynamicY, button) + applySize(" + ${height}", button) + " - ${height}";
} }
} }