diff --git a/src/main/java/org/saturnclient/saturnclient/config/SaturnClientConfig.java b/src/main/java/org/saturnclient/saturnclient/config/SaturnClientConfig.java index 5f35a38..0b9a628 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/SaturnClientConfig.java +++ b/src/main/java/org/saturnclient/saturnclient/config/SaturnClientConfig.java @@ -12,6 +12,7 @@ public class SaturnClientConfig { public static Property saturnTitleScreen = Property.bool(true); public static Property bendyCloaks = Property.bool(true); public static Property openEmoteWheel = Property.keybinding(GLFW.GLFW_KEY_B); + public static Property stagger = Property.bool(true); public static Identifier getLogo() { return realisticLogo.value ? Textures.REALISTIC_LOGO : Textures.LOGO; @@ -23,6 +24,7 @@ public class SaturnClientConfig { config.property("Saturn client title screen", saturnTitleScreen); config.property("Open Emote Wheel", openEmoteWheel); config.property("Bendy Cloaks", bendyCloaks); + config.property("Stagger Animations", stagger); // Initialize a sub namespace for theme Theme.init(config); diff --git a/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java b/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java index d72d62a..3865481 100644 --- a/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java +++ b/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java @@ -3,6 +3,7 @@ package org.saturnclient.ui2.elements; import java.util.ArrayList; import java.util.List; +import org.saturnclient.saturnclient.config.SaturnClientConfig; import org.saturnclient.ui2.Element; import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui2.RenderScope; @@ -17,9 +18,14 @@ public class AnimationStagger extends Element { } public void draw(Element element) { + if (!SaturnClientConfig.stagger.value) { + element.animation = null; + } + if (element.animation != null) { element.animation.delay = delay * children.size(); } + ElementRenderer.draw(children, element); } diff --git a/src/main/java/org/saturnclient/ui2/elements/Scroll.java b/src/main/java/org/saturnclient/ui2/elements/Scroll.java index 68bde0b..3114af6 100644 --- a/src/main/java/org/saturnclient/ui2/elements/Scroll.java +++ b/src/main/java/org/saturnclient/ui2/elements/Scroll.java @@ -83,7 +83,7 @@ public class Scroll extends Element { int calculateScrollBarHeight() { if (maxScroll <= 0) return height - (scrollBarPadding.value * 2); - return Math.max(20, (height * height) / (height + maxScroll)) - (scrollBarPadding.value * 2); + return Math.max(20, (height * height) / (height + maxScroll + 10)) - (scrollBarPadding.value * 2); } int calculateScrollBarY() {