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

Fix[control-editor]: Manual size on free sub-buttons

Browse Source
This commit is contained in:
Mathias Boulay 2023-08-06 11:10:49 +02:00
parent 73608f2749
commit 54e98ec670
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java
View File

@ -92,6 +92,6 @@ public class ControlSubButton extends ControlButton {
@Override @Override
public void loadEditValues(EditControlPopup editControlPopup) { public void loadEditValues(EditControlPopup editControlPopup) {
editControlPopup.loadSubButtonValues(getProperties()); editControlPopup.loadSubButtonValues(getProperties(), parentDrawer.drawerData.orientation);
} }
} }

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java
View File

@ -356,14 +356,16 @@ public class EditControlPopup {
/** /**
* Load values for sub buttons * Load values for sub buttons
*/ */
public void loadSubButtonValues(ControlData data) { public void loadSubButtonValues(ControlData data, ControlDrawerData.Orientation drawerOrientation) {
loadValues(data); loadValues(data);
// Size linked to the parent drawer // Size linked to the parent drawer depending on the drawer settings
mSizeTextview.setVisibility(GONE); if(drawerOrientation != ControlDrawerData.Orientation.FREE){
mSizeXTextView.setVisibility(GONE); mSizeTextview.setVisibility(GONE);
mWidthEditText.setVisibility(GONE); mSizeXTextView.setVisibility(GONE);
mHeightEditText.setVisibility(GONE); mWidthEditText.setVisibility(GONE);
mHeightEditText.setVisibility(GONE);
}
// No conditional, already depends on the parent drawer visibility // No conditional, already depends on the parent drawer visibility
mVisibilityTextView.setVisibility(GONE); mVisibilityTextView.setVisibility(GONE);