fix: ToggleButton missing a message, mouseDragged not forwarded properly (#39)

* Fix ToggleButton not showing a message

* Fix mouseDragged not being forwarded to children

Author: lucyydotp

api/src/main/kotlin/com/noxcrew/sheeplib/CompoundWidget.kt

@@ -102,7 +102,7 @@ public abstract class CompoundWidget(x: Int, y: Int, width: Int, height: Int) :
         super<ContainerEventHandler>.mouseReleased(mouseButtonEvent)
 
     public override fun mouseDragged(mouseButtonEvent: MouseButtonEvent, d: Double, e: Double): Boolean =
-        getChildAt(d, e)
+        getChildAt(mouseButtonEvent.x, mouseButtonEvent.y)
             .getOrNull()
             ?.mouseDragged(mouseButtonEvent, d, e) == true
 

api/src/main/kotlin/com/noxcrew/sheeplib/widget/ThemedButton.kt

@@ -40,6 +40,7 @@ public open class ThemedButton(
     private var messageWidth: Int = Minecraft.getInstance().font.width(message)
 
     override fun setMessage(component: Component) {
+        super.setMessage(component)
         messageWidth = Minecraft.getInstance().font.width(message)
     }
 

api/src/main/kotlin/com/noxcrew/sheeplib/widget/ToggleButton.kt

@@ -40,22 +40,17 @@ public class ToggleButton<T>(
         )
     }
 
-    private lateinit var _message: Component
-
     /** The currently selected entry. */
     public var current: Entry<T> =
         entries.getOrNull(currentIndex) ?: throw IllegalArgumentException("Entries must not be empty")
         private set(value) {
             field = value
-            _message = prefix?.copy()?.append(value.text) ?: value.text
+            message = prefix?.copy()?.append(value.text) ?: value.text
         }
 
-
     /** Delegates to [current.contents][Entry.contents]. */
     public operator fun getValue(thisRef: Any?, property: KProperty<*>): T = current.contents
 
-    override fun getMessage(): Component = _message
-
     init {
         // Set the current to update the text.
         current = current

test-mod/src/main/kotlin/com/noxcrew/sheeplib/testmod/ComponentsDialog.kt

@@ -9,6 +9,7 @@ import com.noxcrew.sheeplib.theme.Themed
 import com.noxcrew.sheeplib.widget.DropdownButton
 import com.noxcrew.sheeplib.widget.SliderWidget
 import com.noxcrew.sheeplib.widget.ThemedButton
+import com.noxcrew.sheeplib.widget.ToggleButton
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.components.StringWidget
 import net.minecraft.client.gui.layouts.Layout
@@ -18,6 +19,14 @@ import net.minecraft.network.chat.Component
 /** A dialog showcasing available components. */
 public class ComponentsDialog(x: Int, y: Int) : Dialog(x, y), Themed by Theme.Active {
 
+    private enum class TestEnum {
+        One,
+        Two,
+        Three,
+        Four,
+        Five,
+    }
+
     override val title: DialogTitleWidget = TextTitleWidget(this, Component.literal("Components"))
     override fun layout(): Layout = linear(LinearLayout.Orientation.VERTICAL) {
         defaultAlignment(0.5f)
@@ -44,6 +53,7 @@ public class ComponentsDialog(x: Int, y: Int) : Dialog(x, y), Themed by Theme.Ac
             displayMapper = Component::literal
         )
 
+        +ToggleButton.enum<TestEnum>("") {}
 
         +SliderWidget(100, 0, 8, this@ComponentsDialog, initial = -1)
     }