diff --git a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java index 5d8cca58..5a9bf06f 100644 --- a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java +++ b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java @@ -87,7 +87,7 @@ public class EffectComponentGroupController implements Initializable, SubControl if (model.isAlwaysEnabled()) { model.removeCheckBox(); } - setInactive(model.isAlwaysEnabled()); + setInactive(!model.isAlwaysEnabled()); label.setText(name); }); @@ -96,7 +96,7 @@ public class EffectComponentGroupController implements Initializable, SubControl if (alwaysEnabled) { model.removeCheckBox(); } - setInactive(alwaysEnabled); + setInactive(!alwaysEnabled); }); ChangeListener listener = (e, old, value) -> { @@ -269,8 +269,8 @@ public class EffectComponentGroupController implements Initializable, SubControl } public void setInactive(boolean inactive) { - slider.setDisable(!inactive); - spinner.setDisable(!inactive); + slider.setDisable(inactive); + spinner.setDisable(inactive); } public void setValue(double value) { diff --git a/src/main/java/sh/ball/gui/controller/EffectsController.java b/src/main/java/sh/ball/gui/controller/EffectsController.java index 15dc415e..4388b769 100644 --- a/src/main/java/sh/ball/gui/controller/EffectsController.java +++ b/src/main/java/sh/ball/gui/controller/EffectsController.java @@ -128,9 +128,7 @@ public class EffectsController implements Initializable, SubController { if (type == EffectType.DEPTH_3D) { Platform.runLater(() -> - List.of(rotateSpeed3D, rotateX, rotateY, rotateZ, zPos).forEach(ecg -> { - ecg.setInactive(!checked); - }) + List.of(rotateSpeed3D, rotateX, rotateY, rotateZ, zPos).forEach(ecg -> ecg.setInactive(!checked)) ); } } @@ -229,6 +227,8 @@ public class EffectsController implements Initializable, SubController { executor.setScript(script); depthFunctionButton.setOnAction(e -> Gui.launchCodeEditor(script, "3D Perspective Effect Depth Function", "text/x-lua", this::updateDepthFunction)); + + List.of(rotateSpeed3D, rotateX, rotateY, rotateZ, zPos).forEach(ecg -> ecg.setInactive(true)); } private void updateDepthFunction(byte[] fileData, String fileName) {