diff --git a/src/main/java/sh/ball/audio/effect/EffectAnimator.java b/src/main/java/sh/ball/audio/effect/EffectAnimator.java index 8fea73d3..a6605cae 100644 --- a/src/main/java/sh/ball/audio/effect/EffectAnimator.java +++ b/src/main/java/sh/ball/audio/effect/EffectAnimator.java @@ -100,6 +100,11 @@ public class EffectAnimator extends PhaseEffect implements SettableEffect { } } } + if (actualValue > maxValue) { + actualValue = maxValue; + } else if (actualValue < minValue) { + actualValue = minValue; + } effect.setValue(actualValue); return effect.apply(count, vector); } diff --git a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java index 2ceacd9e..572bc4ff 100644 --- a/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java +++ b/src/main/java/sh/ball/gui/components/EffectComponentGroupController.java @@ -250,7 +250,14 @@ public class EffectComponentGroupController implements Initializable, SubControl slider.minProperty().addListener((e, old, min) -> this.animator.setMin(min.doubleValue())); slider.maxProperty().addListener((e, old, max) -> this.animator.setMax(max.doubleValue())); slider.valueProperty().addListener((e, old, value) -> this.animator.setValue(value.doubleValue())); - comboBox.valueProperty().addListener((options, old, animationType) -> this.animator.setAnimation(animationType)); + comboBox.valueProperty().addListener((options, old, animationType) -> { + this.animator.setAnimation(animationType); + if (animationType != AnimationType.STATIC) { + slider.setStyle("-thumb-color: #00ff00;"); + } else { + slider.setStyle(""); + } + }); } public EffectAnimator getAnimator() { diff --git a/src/main/resources/css/main.css b/src/main/resources/css/main.css index 8f4b73a6..183391f1 100644 --- a/src/main/resources/css/main.css +++ b/src/main/resources/css/main.css @@ -102,9 +102,13 @@ -fx-text-fill: white; } +.slider { + -thumb-color: white; +} + .slider .thumb { -fx-background-color: very_dark; - -fx-border-color: white; + -fx-border-color: -thumb-color; -fx-border-radius: 1.0em; /* makes sure this remains circular */ -fx-effect: inherit; }