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

feat(control): allow subbuttons of free orientation drawer change size

Browse Source
This commit is contained in:
DreamOneX 2023-08-02 14:26:08 +08:00 committed by ArtDev
parent 403c962ed2
commit 67a3cc5dc0
2 changed files with 6 additions and 4 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/ControlDrawer.java
View File

@ -88,7 +88,7 @@ public class ControlDrawer extends ControlButton {
private void resizeButtons(){ private void resizeButtons(){
if (buttons == null) return; if (buttons == null || drawerData.orientation == ControlDrawerData.Orientation.FREE) return;
for(ControlSubButton subButton : buttons){ for(ControlSubButton subButton : buttons){
subButton.mProperties.setWidth(mProperties.getWidth()); subButton.mProperties.setWidth(mProperties.getWidth());
subButton.mProperties.setHeight(mProperties.getHeight()); subButton.mProperties.setHeight(mProperties.getHeight());

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

@ -21,8 +21,10 @@ public class ControlSubButton extends ControlButton {
} }
private void filterProperties(){ private void filterProperties(){
mProperties.setHeight(parentDrawer.getProperties().getHeight()); if (parentDrawer != null && parentDrawer.drawerData.orientation != ControlDrawerData.Orientation.FREE) {
mProperties.setWidth(parentDrawer.getProperties().getWidth()); mProperties.setHeight(parentDrawer.getProperties().getHeight());
mProperties.setWidth(parentDrawer.getProperties().getWidth());
}
mProperties.isDynamicBtn = false; mProperties.isDynamicBtn = false;
setProperties(mProperties, false); setProperties(mProperties, false);
@ -35,7 +37,7 @@ public class ControlSubButton extends ControlButton {
@Override @Override
public void setLayoutParams(ViewGroup.LayoutParams params) { public void setLayoutParams(ViewGroup.LayoutParams params) {
if(parentDrawer != null){ if(parentDrawer != null && parentDrawer.drawerData.orientation != ControlDrawerData.Orientation.FREE){
params.width = (int)parentDrawer.mProperties.getWidth(); params.width = (int)parentDrawer.mProperties.getWidth();
params.height = (int)parentDrawer.mProperties.getHeight(); params.height = (int)parentDrawer.mProperties.getHeight();
} }