From 54e98ec67063e571cde913a6e17b994fe1159ab8 Mon Sep 17 00:00:00 2001 From: Mathias Boulay Date: Sun, 6 Aug 2023 11:10:49 +0200 Subject: [PATCH] Fix[control-editor]: Manual size on free sub-buttons --- .../customcontrols/buttons/ControlSubButton.java | 2 +- .../handleview/EditControlPopup.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java index 9a4380bec..377b749cf 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/buttons/ControlSubButton.java @@ -92,6 +92,6 @@ public class ControlSubButton extends ControlButton { @Override public void loadEditValues(EditControlPopup editControlPopup) { - editControlPopup.loadSubButtonValues(getProperties()); + editControlPopup.loadSubButtonValues(getProperties(), parentDrawer.drawerData.orientation); } } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java index 78db7d45b..3d799ecbc 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlPopup.java @@ -356,14 +356,16 @@ public class EditControlPopup { /** * Load values for sub buttons */ - public void loadSubButtonValues(ControlData data) { + public void loadSubButtonValues(ControlData data, ControlDrawerData.Orientation drawerOrientation) { loadValues(data); - // Size linked to the parent drawer - mSizeTextview.setVisibility(GONE); - mSizeXTextView.setVisibility(GONE); - mWidthEditText.setVisibility(GONE); - mHeightEditText.setVisibility(GONE); + // Size linked to the parent drawer depending on the drawer settings + if(drawerOrientation != ControlDrawerData.Orientation.FREE){ + mSizeTextview.setVisibility(GONE); + mSizeXTextView.setVisibility(GONE); + mWidthEditText.setVisibility(GONE); + mHeightEditText.setVisibility(GONE); + } // No conditional, already depends on the parent drawer visibility mVisibilityTextView.setVisibility(GONE);