KeyBindWidget and cleaner setting layout

Avanatiker · Avanatiker · commit 736453431681 · 2025-08-14T04:15:32.000+02:00
diff --git a/src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt b/src/main/kotlin/com/lambda/config/settings/FunctionSetting.kt
@@ -36,9 +36,7 @@ open class FunctionSetting<T>(
 ) {
     override fun ImGuiBuilder.buildLayout() {
         button(name) { value() }
-
-        sameLine()
-        helpMarker(description)
+        lambdaTooltip(description)
     }
 
     override fun toJson(): JsonElement = JsonNull.INSTANCE
diff --git a/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt b/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt
@@ -65,10 +65,7 @@ abstract class NumericSetting<T>(
         val valueString = this@NumericSetting.toString()
 
         buildSlider()
-
-        if (description.isNotBlank()) {
-            lambdaTooltip(description)
-        }
+        lambdaTooltip(description)
 
         val itemRectMin = ImGui.getItemRectMin()
         val itemRectMax = ImGui.getItemRectMax()
diff --git a/src/main/kotlin/com/lambda/config/settings/StringSetting.kt b/src/main/kotlin/com/lambda/config/settings/StringSetting.kt
@@ -45,13 +45,12 @@ class StringSetting(
     visibility
 ) {
     override fun ImGuiBuilder.buildLayout() {
-        text(name)
-
-        sameLine()
-        helpMarker(description)
-
-        if (multiline) inputTextMultiline(name, ::value, flags = flags)
-        else inputText(name, ::value, flags)
+        if (multiline) {
+            inputTextMultiline(name, ::value, flags = flags)
+        } else {
+            inputText(name, ::value, flags)
+        }
+        lambdaTooltip(description)
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt
@@ -46,7 +46,7 @@ class ListSetting<T : Any>(
         TypeToken.getParameterized(MutableList::class.java, String::class.java).type
 
     override fun ImGuiBuilder.buildLayout() {
-        combo(name, "${value.size} item(s)") {
+        combo("##$name", "$name: ${value.size} item(s)") {
             immutableList
                 .forEach {
                     val isSelected = value.contains(it)
diff --git a/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt b/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt
@@ -45,7 +45,7 @@ class SetSetting<T : Any>(
         TypeToken.getParameterized(Set::class.java, String::class.java).type
 
     override fun ImGuiBuilder.buildLayout() {
-        combo(name, "${value.size} item(s)") {
+        combo("##$name", "$name: ${value.size} item(s)") {
             immutableSet
                 .forEach {
                     val isSelected = value.contains(it)
diff --git a/src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt b/src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt
@@ -43,10 +43,7 @@ class BooleanSetting(
 ) {
     override fun ImGuiBuilder.buildLayout() {
         checkbox(name, ::value)
-
-        if (description.isNotEmpty()) {
-            lambdaTooltip(description)
-        }
+        lambdaTooltip(description)
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt b/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt
@@ -59,9 +59,9 @@ class EnumSetting<T : Enum<T>>(
 
     override fun ImGuiBuilder.buildLayout() {
         val values = value.enumValues
-        val preview = value.displayValue
+        val currentDisplay = value.displayValue
 
-        combo("##$name", preview = preview) {
+        combo("##$name", preview = "$name: $currentDisplay") {
             values.forEachIndexed { idx, v ->
                 val isSelected = idx == index
 
@@ -73,13 +73,11 @@ class EnumSetting<T : Enum<T>>(
             }
         }
 
-        (value as? Describable)?.let { lambdaTooltip(it.description) }
-        sameLine()
-        text(name)
-        if (description.isNotBlank()) lambdaTooltip(description)
+        lambdaTooltip(description)
     }
 
 
+
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(word(name)) { parameter ->
             suggests { _, builder ->
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt
@@ -24,11 +24,6 @@ import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
 import com.lambda.gui.dsl.ImGuiBuilder
-import com.lambda.gui.dsl.ImGuiBuilder.helpMarker
-import com.lambda.gui.dsl.ImGuiBuilder.inputVec3i
-import com.lambda.gui.dsl.ImGuiBuilder.sameLine
-import com.lambda.gui.dsl.ImGuiBuilder.text
-import com.lambda.gui.dsl.ProcedureBlock
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
@@ -48,17 +43,9 @@ class BlockPosSetting(
     description,
     visibility
 ) {
-    private var x = "${value.x}"
-    private var y = value.y
-    private var z = value.z
-
     override fun ImGuiBuilder.buildLayout() {
-        text(name)
-
-        sameLine()
-        helpMarker(description)
-
-        inputVec3i("##$name", value) { value = it.blockPos }
+        inputVec3i(name, value) { value = it.blockPos }
+        lambdaTooltip(description)
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/ColorSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/ColorSetting.kt
@@ -44,12 +44,8 @@ class ColorSetting(
     visibility
 ) {
     override fun ImGuiBuilder.buildLayout() {
-        text(name)
-
-        sameLine()
-        helpMarker(description)
-
-        colorEdit("##$name", ::value)
+        colorEdit(name, ::value)
+        lambdaTooltip(description)
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/KeyBindSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/KeyBindSetting.kt
@@ -1,20 +1,3 @@
-/*
- * Copyright 2025 Lambda
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.lambda.config.settings.complex
 
 import com.google.gson.reflect.TypeToken
@@ -24,14 +7,12 @@ import com.lambda.brigadier.execute
 import com.lambda.brigadier.required
 import com.lambda.config.AbstractSetting
 import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.gui.widgets.KeybindWidget
 import com.lambda.util.KeyCode
 import com.lambda.util.StringUtils.capitalize
 import com.lambda.util.extension.CommandBuilder
 import net.minecraft.command.CommandRegistryAccess
 
-/**
- * @see [com.lambda.config.Configurable]
- */
 class KeyBindSetting(
     override val name: String,
     defaultValue: KeyCode,
@@ -43,8 +24,15 @@ class KeyBindSetting(
     description,
     visibility
 ) {
+    private val widget = KeybindWidget(
+        label = name,
+        description = description,
+        valueGetter = { value },
+        valueSetter = { value = it },
+    )
+
     override fun ImGuiBuilder.buildLayout() {
-        // ToDo
+        with(widget) { build() }
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt b/src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt
@@ -40,12 +40,8 @@ class Vec3dSetting(
     visibility
 ) {
     override fun ImGuiBuilder.buildLayout() {
-        text(name)
-
-        sameLine()
-        helpMarker(description)
-
-        inputVec3d(name, ::value as Vec3d) // wat da hell
+        inputVec3d(name, ::value as Vec3d)
+        lambdaTooltip(description)
     }
 
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
diff --git a/src/main/kotlin/com/lambda/gui/dsl/ImGuiBuilder.kt b/src/main/kotlin/com/lambda/gui/dsl/ImGuiBuilder.kt
@@ -1427,6 +1427,7 @@ object ImGuiBuilder {
      */
     @ImGuiDsl
     fun lambdaTooltip(description: String) {
+        if (description.isBlank()) return
         onItemHover {
             tooltip {
                 withTextWrapPos(fontSize * 35f) {
@@ -1436,23 +1437,6 @@ object ImGuiBuilder {
         }
     }
 
-    /**
-     * Creates a help marker with a tooltip.
-     *
-     * @param description Help text to display
-     */
-    @ImGuiDsl
-    fun helpMarker(description: String, text: String = "(?)") {
-        textDisabled(text)
-        onItemHover(ImGuiHoveredFlags.Stationary) {
-            tooltip {
-                withTextWrapPos(fontSize * 35f) {
-                    textUnformatted(description)
-                }
-            }
-        }
-    }
-
     /**
      * Creates a popup.
      *
diff --git a/src/main/kotlin/com/lambda/gui/widgets/KeybindWidget.kt b/src/main/kotlin/com/lambda/gui/widgets/KeybindWidget.kt
@@ -0,0 +1,91 @@
+package com.lambda.gui.widgets
+
+import com.lambda.event.events.KeyboardEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
+import com.lambda.gui.dsl.ImGuiBuilder
+import com.lambda.util.KeyCode
+import imgui.ImGui
+import imgui.flag.ImGuiCol
+import imgui.flag.ImGuiHoveredFlags
+import imgui.flag.ImGuiMouseButton
+import org.lwjgl.glfw.GLFW
+
+class KeybindWidget(
+    private val label: String,
+    private val description: String = "",
+    private val valueGetter: () -> KeyCode,
+    private val valueSetter: (KeyCode) -> Unit,
+) {
+    private var listening = false
+
+    init {
+        listen<KeyboardEvent.Press> { event ->
+            if (!listening) return@listen
+            if (!event.isPressed) return@listen
+            val translated = event.translated
+
+            when (translated.keyCode) {
+                GLFW.GLFW_KEY_ESCAPE -> {
+                    listening = false
+                }
+                GLFW.GLFW_KEY_BACKSPACE, GLFW.GLFW_KEY_DELETE -> {
+                    valueSetter(KeyCode.UNBOUND)
+                    listening = false
+                }
+                else -> {
+                    valueSetter(translated)
+                    listening = false
+                }
+            }
+        }
+    }
+
+    fun ImGuiBuilder.build() {
+        val current = valueGetter()
+        val translated = KeyCode.virtualMapUS(current.keyCode, 0)
+        val preview = if (listening) "$label: Press any key…" else "$label: ${translated.prettyDisplay()}"
+
+        if (listening) {
+            withStyleColor(ImGuiCol.Button, 0.20f, 0.50f, 1.00f, 1.00f) {
+                withStyleColor(ImGuiCol.ButtonHovered, 0.25f, 0.60f, 1.00f, 1.00f) {
+                    withStyleColor(ImGuiCol.ButtonActive, 0.20f, 0.50f, 0.95f, 1.00f) {
+                        button(preview)
+                    }
+                }
+            }
+        } else {
+            button(preview) { listening = true }
+        }
+
+        lambdaTooltip(
+            if (!listening)
+                description.ifBlank { "Click to set. Right-click to unbind. Esc cancels. Backspace/Delete unbinds." }
+            else
+                "Listening… Press a key to bind. Esc to cancel. Backspace/Delete to unbind."
+        )
+
+        onItemClick(ImGuiMouseButton.Right) {
+            valueSetter(KeyCode.UNBOUND)
+            listening = false
+        }
+
+        if (listening && !isAnyItemHovered && ImGui.isMouseClicked(ImGuiMouseButton.Left)) {
+            listening = false
+        }
+
+        sameLine()
+        smallButton("Unbind") {
+            valueSetter(KeyCode.UNBOUND)
+            listening = false
+        }
+        onItemHover(ImGuiHoveredFlags.Stationary) {
+            lambdaTooltip("Clear binding")
+        }
+    }
+
+    private fun KeyCode.prettyDisplay(): String {
+        if (this == KeyCode.UNBOUND) return "Unbound"
+        val name = GLFW.glfwGetKeyName(keyCode, 0)
+        return name?.ifBlank { null }?.uppercase() ?: this.name
+    }
+}
diff --git a/src/main/kotlin/com/lambda/module/Module.kt b/src/main/kotlin/com/lambda/module/Module.kt
@@ -136,10 +136,11 @@ abstract class Module(
 
     override fun ImGuiBuilder.buildLayout() {
         checkbox("##-${this@Module}", ::isEnabled)
+        lambdaTooltip(description)
         sameLine()
-
         treeNode(name) {
-            group { // Use a group to ensure layout is calculated correctly.
+            lambdaTooltip(description)
+            group {
                 val visibleSettings = settings.filter { it.visibility() }
                 val (grouped, ungrouped) = visibleSettings.partition { it.groups.isNotEmpty() }
 
@@ -148,9 +149,6 @@ abstract class Module(
                 renderGroup(grouped, emptyList())
             }
         }
-
-        sameLine()
-        helpMarker(description)
     }
 
     private fun ImGuiBuilder.renderGroup(settings: List<AbstractSetting<*>>, parentPath: List<NamedEnum>) {
diff --git a/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt b/src/main/kotlin/com/lambda/module/modules/player/HighwayTools.kt
@@ -31,6 +31,7 @@ import com.lambda.task.Task
 import com.lambda.task.tasks.BuildTask.Companion.build
 import com.lambda.util.BaritoneUtils
 import com.lambda.util.Communication.info
+import com.lambda.util.Describable
 import com.lambda.util.NamedEnum
 import com.lambda.util.extension.Structure
 import com.lambda.util.extension.moveY
@@ -76,12 +77,21 @@ object HighwayTools : Module(
     private var currentPos = BlockPos.ORIGIN
     private var runningTask: Task<*>? = null
 
-    enum class Material {
-        None, Solid, Block
+    enum class Material(
+        override val displayName: String,
+        override val description: String
+    ): NamedEnum, Describable {
+        None("None", "Wont pave the highway"),
+        Solid("Solid", "Paves the highway with solid blocks. Will use any full block available. Useful if you only want to make sure that the highway is encased."),
+        Block("Block", "Paves the highway with a specific block. Will use the block you specified in the settings"),
     }
 
-    enum class Corner {
-        None, Solid
+    enum class Corner(
+        override val displayName: String,
+        override val description: String
+    ): NamedEnum, Describable {
+        None("None", "Wont fill the corner block of the highway pavement below the rims."),
+        Solid("Solid", "Fills the corner block of the highway pavement below the rims with solid blocks."),
     }
 
     enum class Group(override val displayName: String): NamedEnum {
