Button action refactor

Author: bladekt

common/src/main/kotlin/com/lambda/gui/api/component/InteractiveComponent.kt

@@ -7,18 +7,10 @@ import com.lambda.util.Mouse
 
 abstract class InteractiveComponent : IComponent, IRectComponent {
     protected var hovered = false
-    protected var pressed = false; set(value) {
-        if (field == value) return
-        field = value
+    protected var pressed = false
 
-        if (value) onPress()
-        else onRelease()
-    }
-
-    protected var activeMouseButton: Mouse.Button? = null
-
-    protected open fun onPress() {}
-    protected open fun onRelease() {}
+    protected open fun onPress(e: GuiEvent.MouseClick) {}
+    protected open fun onRelease(e: GuiEvent.MouseClick) {}
 
     override fun onEvent(e: GuiEvent) {
         when (e) {
@@ -32,11 +24,12 @@ abstract class InteractiveComponent : IComponent, IRectComponent {
             }
 
             is GuiEvent.MouseClick -> {
-                activeMouseButton = e.button.takeUnless {
-                    it.isMainButton && e.action == Mouse.Action.Click
-                }
-
+                val prevPressed = pressed
                 pressed = hovered && e.button.isMainButton && e.action == Mouse.Action.Click
+
+                if (prevPressed == pressed) return
+                if (pressed) onPress(e)
+                else onRelease(e)
             }
         }
     }

common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt

@@ -6,7 +6,6 @@ import com.lambda.gui.api.component.WindowComponent
 import com.lambda.gui.api.component.core.list.ChildComponent
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.modules.client.GuiSettings
-import com.lambda.util.Mouse
 import com.lambda.util.math.ColorUtils.multAlpha
 import com.lambda.util.math.MathUtils.lerp
 import com.lambda.util.math.Rect
@@ -91,7 +90,7 @@ abstract class ButtonComponent(
         }
     }
 
-    abstract fun performClickAction(mouse: Mouse.Button)
+    abstract fun performClickAction(e: GuiEvent.MouseClick)
 
     override fun onEvent(e: GuiEvent) {
         super.onEvent(e)
@@ -106,8 +105,8 @@ abstract class ButtonComponent(
         }
     }
 
-    override fun onRelease() {
-        activeMouseButton?.let(::performClickAction)
+    override fun onRelease(e: GuiEvent.MouseClick) {
+        performClickAction(e)
     }
 
     override fun onRemove() {

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

@@ -1,5 +1,6 @@
 package com.lambda.gui.impl.clickgui.buttons
 
+import com.lambda.gui.api.GuiEvent
 import com.lambda.gui.api.component.WindowComponent
 import com.lambda.gui.api.component.button.ListButton
 import com.lambda.gui.impl.clickgui.windows.SettingsWindow
@@ -9,16 +10,18 @@ import com.lambda.util.Mouse
 class ModuleButton(val module: Module, owner: WindowComponent<*>) : ListButton(owner) {
     override val text get() = module.name
     override val active get() = module.isEnabled
+    private val gui = owner.owner
 
-    override fun performClickAction(mouse: Mouse.Button) {
-        when (mouse) {
+    private val settingsWindow = SettingsWindow(this, gui)
+
+    override fun performClickAction(e: GuiEvent.MouseClick) {
+        when (e.button) {
             Mouse.Button.Left -> if (hovered) module.toggle()
             Mouse.Button.Right -> {
-                val gui = owner.owner
-
                 gui.scheduleAction {
-                    val settingsWindow = SettingsWindow(this, gui)
-                    gui.windows.addChild(settingsWindow)
+                    gui.windows.addChild(settingsWindow.apply {
+                        position = e.mouse
+                    })
                 }
             }
         }