Another scale fix

Author: bladekt

common/src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -56,11 +56,13 @@ abstract class AbstractSetting<T : Any>(
     val description: String,
     val visibility: () -> Boolean,
 ) : Jsonable, Nameable {
-    private val listeners = mutableListOf<(from: T, to: T) -> Unit>()
+    private val listeners = mutableListOf<ValueListener<T>>()
 
     var value: T by Delegates.observable(defaultValue) { _, from, to ->
-        if (from == to) return@observable
-        listeners.forEach { it(from, to) }
+        listeners.forEach {
+            if (it.requiresValueChange && from == to) return@forEach
+            it.execute(from, to)
+        }
     }
 
     private val isVisible get() = visibility()
@@ -79,18 +81,24 @@ abstract class AbstractSetting<T : Any>(
     }
 
     fun onValueChange(block: SafeContext.(from: T, to: T) -> Unit) {
-        listeners.add { from, to ->
+        listeners.add(ValueListener(true) { from, to ->
             runSafe {
                 block(from, to)
             }
-        }
+        })
     }
 
     fun onValueChangeUnsafe(block: (from: T, to: T) -> Unit) {
-        listeners.add(block)
+        listeners.add(ValueListener(true, block))
+    }
+
+    fun onValueSet(block: (from: T, to: T) -> Unit) {
+        listeners.add(ValueListener(false, block))
     }
 
     private fun reset() {
         value = defaultValue
     }
+
+    class ValueListener <T> (val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/EnumSlider.kt

@@ -21,10 +21,8 @@ class EnumSlider <T : Enum<T>> (
     private val values = setting.enumValues
     private val enumSize = values.size
 
-    override val progress get() = if (dragProgress != -1.0) dragProgress else
-        transform(value.ordinal.toDouble(), 0.0, enumSize - 1.0, 0.0, 1.0)
-
-    private var dragProgress = -1.0
+    override val progress get() = transform(value.ordinal.toDouble(), 0.0, enumSize - 1.0, 0.0, 1.0)
+    private var valueSetByDrag = false
 
     override fun onEvent(e: GuiEvent) {
         super.onEvent(e)
@@ -47,17 +45,16 @@ class EnumSlider <T : Enum<T>> (
     override fun setValueByProgress(progress: Double) {
         val entryIndex = floor(progress * enumSize).toInt().coerceIn(0, enumSize - 1)
         value = values[entryIndex]
-        dragProgress = progress
+        valueSetByDrag = true
     }
 
-    override fun onPress(e: GuiEvent.MouseClick) {}
+    override fun onPress(e: GuiEvent.MouseClick) {
+        valueSetByDrag = false
+    }
 
     override fun onRelease(e: GuiEvent.MouseClick) {
-        if (dragProgress == -1.0) {
-            setting.next()
-            playClickSound()
-        }
-
-        dragProgress = -1.0
+        if (valueSetByDrag) return
+        playClickSound()
+        setting.next()
     }
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/NumberSlider.kt

@@ -62,8 +62,8 @@ class NumberSlider <N>(
         inputBar.toggle()
     }
 
-    override fun slide(mouse: Vec2d) {
-        if (!inputBar.isActive) super.slide(mouse)
+    override fun slide() {
+        if (!inputBar.isActive) super.slide()
     }
 
     override fun setValueByProgress(progress: Double) {

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/Slider.kt

@@ -19,13 +19,19 @@ abstract class Slider <V : Any, T : AbstractSetting<V>>(
     setting: T, owner: ChildLayer.Drawable<SettingButton<*, *>, ModuleButton>
 ) : SettingButton<V, T>(setting, owner) {
     protected abstract val progress: Double
-    private val progressAnimation by animation.exp(::progress, 0.6)
+    // Force this slider to follow mouse when dragging instead of rounding to the closest setting value
+    private val progressAnimation by animation.exp({ mouseX?.let(::getProgressByMouse) ?: progress }, 0.6)
     private val renderProgress get() = lerp(0.0, progressAnimation, showAnimation)
 
     protected abstract fun setValueByProgress(progress: Double)
     private var lastPlayedValue = value
     private var lastPlayedTiming = 0L
 
+    private var mouseX: Double? = null; get() {
+        if (activeButton != Mouse.Button.Left) field = null
+        return field
+    }
+
     override fun onEvent(e: GuiEvent) {
         super.onEvent(e)
 
@@ -38,23 +44,23 @@ abstract class Slider <V : Any, T : AbstractSetting<V>>(
                     color = GuiSettings.mainColor.multAlpha(showAnimation * 0.3),
                     shade = GuiSettings.shade
                 )
+
+                slide()
             }
 
             is GuiEvent.MouseMove -> {
-                slide(e.mouse)
+                mouseX = e.mouse.x
             }
         }
     }
 
     override fun onPress(e: GuiEvent.MouseClick) {
         super.onPress(e)
-        slide(e.mouse)
+        mouseX = e.mouse.x
     }
 
-    protected open fun slide(mouse: Vec2d) {
-        if (activeButton != Mouse.Button.Left) return
-
-        setValueByProgress(transform(mouse.x, rect.left, rect.right, 0.0, 1.0).coerceIn(0.0, 1.0))
+    protected open fun slide() = mouseX?.let { mouseX ->
+        setValueByProgress(getProgressByMouse(mouseX))
         playClickSound()
     }
 
@@ -67,4 +73,7 @@ abstract class Slider <V : Any, T : AbstractSetting<V>>(
 
         playSound(LambdaSound.BUTTON_CLICK.event, lerp(0.9, 1.2, progress))
     }
+
+    private fun getProgressByMouse(mouseX: Double) =
+        transform(mouseX, rect.left, rect.right, 0.0, 1.0).coerceIn(0.0, 1.0)
 }

common/src/main/kotlin/com/lambda/module/modules/client/GuiSettings.kt

@@ -19,7 +19,7 @@ object GuiSettings : Module(
 
     // General
     private val scaleSetting by setting("Scale", 100, 50..300, 1, visibility = { page == Page.General }).apply {
-        onValueChangeUnsafe { _, _ ->
+        onValueSet { _, _ ->
             lastChange = System.currentTimeMillis()
         }
     }
@@ -45,7 +45,7 @@ object GuiSettings : Module(
     }
 
     private var targetScale = 2.0; get() {
-        val update = System.currentTimeMillis() - lastChange > 1000 || !LambdaClickGui.isOpen
+        val update = System.currentTimeMillis() - lastChange > 200 || !LambdaClickGui.isOpen
         if (update) field = scaleSetting / 100.0 * 2.0
         return field
     }