cleanup

Author: Blade-kt

common/src/main/kotlin/com/lambda/gui/GuiManager.kt

@@ -29,7 +29,7 @@ import com.lambda.gui.impl.clickgui.module.settings.BooleanButton.Companion.bool
 import com.lambda.gui.impl.clickgui.module.settings.EnumSlider.Companion.enumSetting
 import com.lambda.gui.impl.clickgui.module.settings.KeybindPicker.Companion.keybindSetting
 import com.lambda.gui.impl.clickgui.module.settings.NumberSlider.Companion.numericSetting
-import com.lambda.gui.impl.clickgui.settings.UnitButton.Companion.unitSetting
+import com.lambda.gui.impl.clickgui.module.settings.UnitButton.Companion.unitSetting
 import kotlin.reflect.KClass
 
 object GuiManager : Loadable {

common/src/main/kotlin/com/lambda/gui/component/window/Window.kt

@@ -150,6 +150,9 @@ open class Window(
         properties.clampPosition = owner is ScreenLayout
 
         onUpdate {
+            // Update it here
+            content.updateHeight()
+
             width = widthAnimation
             height = titleBar.height + when (minimizing) {
                 Minimizing.Disabled -> targetHeight

common/src/main/kotlin/com/lambda/gui/component/window/WindowContent.kt

@@ -73,13 +73,6 @@ class WindowContent(
             positionX = owner.titleBar.positionX
             positionY = owner.titleBar.let { it.positionY + it.height } + renderScrollOffset * scrollable.toInt()
             width = owner.width
-
-            height = ClickGui.padding * 2
-
-            val lastIndex = children.lastIndex
-            children.forEachIndexed { i, it ->
-                height += layoutHeight(it, false, i == lastIndex)
-            }
         }
 
         onShow {
@@ -113,6 +106,15 @@ class WindowContent(
         }
     }
 
+    fun updateHeight() {
+        height = ClickGui.padding * 2
+
+        val lastIndex = children.lastIndex
+        children.forEachIndexed { i, it ->
+            height += layoutHeight(it, false, i == lastIndex)
+        }
+    }
+
     private fun layoutHeight(layout: Layout, animate: Boolean, isLast: Boolean = false): Double {
         var height = layout.height + ClickGui.listStep * (!isLast).toInt()
         val animated = layout as? AnimatedChild ?: return height

common/src/main/kotlin/com/lambda/gui/impl/clickgui/core/SliderLayout.kt

@@ -27,19 +27,20 @@ import com.lambda.gui.component.layout.Layout
 import com.lambda.gui.impl.clickgui.module.settings.SettingSlider
 import com.lambda.module.modules.client.ClickGui
 import com.lambda.util.Mouse
+import com.lambda.util.math.MathUtils.toInt
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.multAlpha
 import com.lambda.util.math.setAlpha
 import com.lambda.util.math.transform
 import java.awt.Color
 
 class SliderLayout(
-    owner: Layout
+    owner: Layout,
+    private val isVertical: Boolean
 ) : AnimatedChild(owner, "") {
     // Not a great solution
     private val setting = owner as? SettingSlider<*, *>
     private val showAnim get() = setting?.showAnimation ?: showAnimation
-    private val hoverAnim get() = setting?.hoverAnimation ?: hoverAnimation
     private val pressedBut get() = setting?.pressedButton ?: pressedButton
 
     // Actions
@@ -74,9 +75,9 @@ class SliderLayout(
     }
 
     private val dragProgress: Double get() = transform(
-        mousePosition.x - bg.positionX,
-        0.0, bg.width,
-        0.0, 1.0
+        if (isVertical) mousePosition.y - bg.positionY else mousePosition.x - bg.positionX,
+        0.0, if (isVertical) bg.height else bg.width,
+        isVertical.toInt().toDouble(), 1.0 - isVertical.toInt().toDouble()
     ).coerceIn(0.0, 1.0)
 
     init {
@@ -93,7 +94,13 @@ class SliderLayout(
         rect {
             onUpdate { // progress
                 rect = bg.rect
-                width *= renderProgress
+
+                if (isVertical) {
+                    height *= renderProgress
+                    positionY = bg.positionY + bg.height - height
+                } else {
+                    width *= renderProgress
+                }
 
                 shade = ClickGui.backgroundShade
                 setColor(Color.WHITE.setAlpha(0.25 * showAnim))
@@ -118,25 +125,28 @@ class SliderLayout(
          */
         @UIBuilder
         fun Layout.slider(
+            isVertical: Boolean = false,
             block: SliderLayout.() -> Unit = {}
-        ) = SliderLayout(this).apply(children::add).apply(block)
+        ) = SliderLayout(this, isVertical).apply(children::add).apply(block)
 
         /**
          * Adds a [SliderLayout] behind given [layout]
          */
         @UIBuilder
         fun Layout.sliderBehind(
             layout: Layout,
+            isVertical: Boolean = false,
             block: SliderLayout.() -> Unit = {}
-        ) = SliderLayout(this).insertLayout(this, layout, false).apply(block)
+        ) = SliderLayout(this, isVertical).insertLayout(this, layout, false).apply(block)
 
         /**
          * Adds a [SliderLayout] over given [layout]
          */
         @UIBuilder
         fun Layout.sliderOver(
             layout: Layout,
+            isVertical: Boolean = false,
             block: SliderLayout.() -> Unit = {}
-        ) = SliderLayout(this).insertLayout(this, layout, true).apply(block)
+        ) = SliderLayout(this, isVertical).insertLayout(this, layout, true).apply(block)
     }
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/KeybindPicker.kt

@@ -43,6 +43,15 @@ class KeybindPicker(
             }
         }
 
+        onShow {
+            isListening = false
+        }
+
+        onTick {
+            val module = (owner.owner as? ModuleLayout) ?: return@onTick
+            if (module.isMinimized) isListening = false
+        }
+
         onMouseAction(Mouse.Button.Left) {
             isListening = !isListening
         }
@@ -53,15 +62,6 @@ class KeybindPicker(
             settingDelegate = key
             isListening = false
         }
-
-        onShow {
-            isListening = false
-        }
-
-        onTick {
-            val module = (owner.owner as? ModuleLayout) ?: return@onTick
-            if (module.isMinimized) isListening = false
-        }
     }
 
     companion object {

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/SettingSlider.kt

@@ -34,7 +34,6 @@ abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
     abstract val settingValue: String
 
     private var changeAnimation by animation.exp(0.0, 1.0, 0.5) { true }
-
     private val sliderHeight = 3.0
 
     protected val slider = sliderBehind(titleBar) {

…gui/impl/clickgui/settings/UnitButton.kt …l/clickgui/module/settings/UnitButton.ktcommon/src/main/kotlin/com/lambda/gui/impl/clickgui/settings/UnitButton.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/UnitButton.kt common/src/main/kotlin/com/lambda/gui/impl/clickgui/settings/UnitButton.kt renamed to common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/UnitButton.kt

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.gui.impl.clickgui.settings
+package com.lambda.gui.impl.clickgui.module.settings
 
 import com.lambda.config.settings.FunctionSetting
 import com.lambda.gui.component.core.UIBuilder
@@ -28,7 +28,7 @@ class UnitButton <T> (
     setting: FunctionSetting<T>,
 ) : SettingLayout<() -> T, FunctionSetting<T>>(owner, setting) {
     init {
-        onMouse(Mouse.Button.Left, Mouse.Action.Click) {
+        onMouseAction(Mouse.Button.Left) {
             setting.value()
         }
     }