add text box to slider element

Author: NopoTheGamer

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/SliderComponent.kt

@@ -1,10 +1,13 @@
 package io.github.notenoughupdates.moulconfig.gui.component
 
 import io.github.notenoughupdates.moulconfig.GuiTextures
+import io.github.notenoughupdates.moulconfig.common.IMinecraft
 import io.github.notenoughupdates.moulconfig.gui.GuiComponent
 import io.github.notenoughupdates.moulconfig.gui.GuiImmediateContext
+import io.github.notenoughupdates.moulconfig.gui.KeyboardEvent
 import io.github.notenoughupdates.moulconfig.gui.MouseEvent
 import io.github.notenoughupdates.moulconfig.observer.GetSetter
+import java.util.function.BiFunction
 import kotlin.math.max
 import kotlin.math.min
 
@@ -29,12 +32,13 @@ open class SliderComponent(
             setValueFromContext(context)
         }
         val value: Float = value.get()
+        context.renderContext.translate(-(width/3).toFloat(), 0f, 0f)
         context.renderContext.color(1f, 1f, 1f, 1f)
         mc.bindTexture(GuiTextures.SLIDER_ON_CAP)
         context.renderContext.drawTexturedRect(0F, 0F, 4F, context.height.toFloat())
         mc.bindTexture(GuiTextures.SLIDER_OFF_CAP)
         context.renderContext.drawTexturedRect((width - 4).toFloat(), 0F, 4F, context.height.toFloat())
-        val sliderPosition = ((value - minValue) / (maxValue - minValue) * context.width).toInt()
+        val sliderPosition = ((value.coerceIn(minValue..maxValue) - minValue) / (maxValue - minValue) * context.width).toInt()
         if (sliderPosition > 5) {
             mc.bindTexture(GuiTextures.SLIDER_ON_SEGMENT)
             context.renderContext.drawTexturedRect(4F, 0F, (sliderPosition - 4).toFloat(), context.height.toFloat())
@@ -55,25 +59,75 @@ open class SliderComponent(
         }
         mc.bindTexture(GuiTextures.SLIDER_BUTTON)
         context.renderContext.drawTexturedRect((sliderPosition - 4).toFloat(), 0F, 8F, context.height.toFloat())
+
+        context.renderContext.translate(60f, -5f, 0f)
+        componentNumberInput.render(context.translated(60, -5, componentNumberInput.width, 18))
     }
 
     fun setValueFromContext(context: GuiImmediateContext) {
-        var v: Float = context.mouseX * (maxValue - minValue) / context.width + minValue
+        var v: Float = (context.mouseX + width/3) * (maxValue - minValue) / context.width + minValue
         v = min(v.toDouble(), maxValue.toDouble()).toFloat()
         v = max(v.toDouble(), minValue.toDouble()).toFloat()
         v = Math.round(v / minStep) * minStep
         value.set(v)
     }
 
+    // I made this because I couldn't get isHovered to work with the translation
+    private fun GuiImmediateContext.isHovered(): Boolean {
+        return mouseX in 0 - width/3 until width && mouseY in 0 until height
+    }
+
     override fun mouseEvent(mouseEvent: MouseEvent, context: GuiImmediateContext): Boolean {
         if (!context.renderContext.isMouseButtonDown(0)) clicked = false
-        if (context.isHovered && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == 0) {
+        if (context.isHovered() && mouseEvent is MouseEvent.Click && mouseEvent.mouseState && mouseEvent.mouseButton == 0) {
             clicked = true
         }
         if (clicked) {
             setValueFromContext(context)
-            return true
         }
-        return false
+        return componentNumberInput.mouseEvent(mouseEvent, context.translated(45, -5, componentNumberInput.width, 18))
+    }
+
+    override fun keyboardEvent(event: KeyboardEvent, context: GuiImmediateContext): Boolean {
+        return componentNumberInput.keyboardEvent(event, context)
+    }
+
+    private val componentNumberInput by lazy {
+        TextFieldComponent(
+            object : GetSetter<String> {
+                var editingBuffer: String = ""
+
+                override fun get(): String {
+                    if (isFocused) return editingBuffer
+                    var num: Float
+                    try {
+                        num = value.get()
+                    } catch (e: NumberFormatException) {
+                        num = 0f
+                    }
+                    val stringNum = num.toString().removeSuffix(".0")
+                    return stringNum.also { editingBuffer = it }
+                }
+
+                override fun set(newValue: String) {
+                    editingBuffer = newValue
+                    var num: Float
+                    try {
+                        num = editingBuffer.toFloat()
+                    } catch (e: NumberFormatException) {
+                        num = 0f
+                    }
+                    value.set(num).also { editingBuffer = num.toString() }
+                }
+            },
+            20,
+            GetSetter.constant(true),
+            "#000000",
+            IMinecraft.instance.defaultFontRenderer
+        )
+    }
+
+    override fun <T : Any?> foldChildren(initial: T, visitor: BiFunction<GuiComponent, T, T>): T {
+        return visitor.apply(componentNumberInput, initial)
     }
 }

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/component/TextFieldComponent.kt

@@ -25,6 +25,7 @@ open class TextFieldComponent(
     private var scrollOffset = 0
     private var visibleText: String? = null
     override fun getWidth(): Int {
+        if (isFocused) return max(preferredWidth, font.getStringWidth(text.get()))
         return preferredWidth
     }
 
@@ -248,10 +249,12 @@ open class TextFieldComponent(
         super.mouseEvent(mouseEvent, context)
         checkScrollOffset(context.width)
         updateVisibleText(context.width)
-        if (context.isHovered && mouseEvent is Click) {
-            if (mouseEvent.mouseState) {
+        if (mouseEvent is Click && mouseEvent.mouseState) {
+            if (context.isHovered) {
                 requestFocus()
                 return true
+            } else {
+                setFocus(false)
             }
         }
         return false

common/src/main/java/io/github/notenoughupdates/moulconfig/gui/editors/GuiOptionEditorSlider.java

@@ -13,7 +13,7 @@ public GuiOptionEditorSlider(ProcessedOption option, float minValue, float maxVa
         super(option);
         if (minStep < 0) minStep = 0.01f;
 
-        component = wrapComponent(new SliderComponent((GetSetter<Float>) option.intoProperty(), minValue, maxValue, minStep, 60));
+        component = wrapComponent(new SliderComponent((GetSetter<Float>) option.intoProperty(), minValue, maxValue, minStep, 55));
     }
 
     public float getFloatValue() {