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

Fix[controls]: incorrect activated overlay on rounded controls

Browse Source
This commit is contained in:
Mathias-Boulay 2023-05-19 00:39:08 +02:00 committed by ArtDev
parent b4a3e18b9a
commit 6e194302f5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,9 @@ public class ControlButton extends TextView implements ControlInterface {
protected ControlData mProperties; protected ControlData mProperties;
private final ControlLayout mControlLayout; private final ControlLayout mControlLayout;
/* Cache value from the ControlData radius for drawing purposes */
private float mComputedRadius;
protected boolean mIsToggled = false; protected boolean mIsToggled = false;
protected boolean mIsPointerOutOfBounds = false; protected boolean mIsPointerOutOfBounds = false;
@ -61,6 +64,7 @@ public class ControlButton extends TextView implements ControlInterface {
public void setProperties(ControlData properties, boolean changePos) { public void setProperties(ControlData properties, boolean changePos) {
mProperties = properties; mProperties = properties;
ControlInterface.super.setProperties(properties, changePos); ControlInterface.super.setProperties(properties, changePos);
mComputedRadius = ControlInterface.super.computeCornerRadius(mProperties.cornerRadius);
if (mProperties.isToggle) { if (mProperties.isToggle) {
//For the toggle layer //For the toggle layer
@ -85,7 +89,7 @@ public class ControlButton extends TextView implements ControlInterface {
protected void onDraw(Canvas canvas) { protected void onDraw(Canvas canvas) {
super.onDraw(canvas); super.onDraw(canvas);
if (mIsToggled || (!mProperties.isToggle && isActivated())) if (mIsToggled || (!mProperties.isToggle && isActivated()))
canvas.drawRoundRect(0, 0, getWidth(), getHeight(), mProperties.cornerRadius, mProperties.cornerRadius, mRectPaint); canvas.drawRoundRect(0, 0, getWidth(), getHeight(), mComputedRadius, mComputedRadius, mRectPaint);
} }