misc changes

Author: bladekt

common/src/main/kotlin/com/lambda/module/modules/client/NewCGui.kt

@@ -4,8 +4,10 @@ import com.lambda.module.Module
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.tag.ModuleTag
 import com.lambda.newgui.ScreenLayout.Companion.gui
+import com.lambda.newgui.component.core.FilledRect.Companion.rect
 import com.lambda.newgui.impl.clickgui.ModuleLayout.Companion.moduleLayout
 import com.lambda.newgui.impl.clickgui.ModuleWindow.Companion.moduleWindow
+import com.lambda.util.math.Rect
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.setAlpha
 import java.awt.Color
@@ -22,6 +24,8 @@ object NewCGui : Module(
 
     val roundRadius by setting("Round Radius", 2.0, 0.0..10.0, 0.1)
 
+    val backgroundTint by setting("Background Tint", Color.BLACK.setAlpha(0.4))
+
     val titleBackgroundColor by setting("Title Background Color", Color.WHITE.setAlpha(0.4))
     val backgroundColor by setting("Background Color", Color.WHITE.setAlpha(0.25))
     val backgroundShade by setting("Background Shade", true)
@@ -31,20 +35,29 @@ object NewCGui : Module(
     val outlineColor by setting("Outline Color", Color.WHITE.setAlpha(0.6)) { outline }
     val outlineShade by setting("Outline Shade", true) { outline }
 
+    val moduleEnabledColor by setting("Module Enabled Color", Color.WHITE.setAlpha(0.25))
+    val moduleDisabledColor by setting("Module Disabled Color", Color.WHITE.setAlpha(0.05))
+
     private val SCREEN get() = gui("New Click Gui") {
+        rect {
+            rectangle = Rect(Vec2d.ZERO, this.size)
+            setColor(backgroundTint)
+        }
+
         val tags = ModuleTag.defaults
         val modules = ModuleRegistry.modules
 
-        tags.forEachIndexed { i, tag ->
-            val windowPosition = Vec2d.ONE * 20.0 + Vec2d.RIGHT * ((115.0 * i) + (i + 1) * 4)
+        var x = 20.0
+        val y = x
 
-            moduleWindow(tag, windowPosition) {
+        tags.forEachIndexed { i, tag ->
+            x += moduleWindow(tag, Vec2d(x, y)) {
                 modules.filter {
                     it.defaultTags.firstOrNull() == tag
                 }.forEach { module ->
                     moduleLayout(module)
                 }
-            }
+            }.width + 3
         }
     }
 

common/src/main/kotlin/com/lambda/newgui/component/core/FilledRect.kt

@@ -1,12 +1,13 @@
 package com.lambda.newgui.component.core
 
 import com.lambda.newgui.component.layout.Layout
+import com.lambda.util.math.Rect
 import java.awt.Color
 
 class FilledRect(
     owner: Layout
 ) : Layout(owner, true, true) {
-    var rectangle = owner.rect
+    var rectangle = Rect.ZERO
 
     var leftTopRadius = 0.0
     var rightTopRadius = 0.0

common/src/main/kotlin/com/lambda/newgui/component/core/TextField.kt

@@ -32,10 +32,7 @@ class TextField(
                 action(this@TextField)
             }
 
-            width = textWidth
-            height = textHeight
-
-            val renderPos = Vec2d(renderPositionX, renderPositionY + renderHeight * 0.5)
+            val renderPos = Vec2d(renderPositionX, renderPositionY + textHeight * 0.5)
             fr.build(text, renderPos, color, scale, shadow)
         }
     }

common/src/main/kotlin/com/lambda/newgui/component/window/TitleBar.kt

@@ -21,14 +21,10 @@ class TitleBar(
         text = title
         bold = true
 
-        horizontalAlignment = HAlign.CENTER
-        verticalAlignment = VAlign.CENTER
+        val tb = this@TitleBar
 
-        onUpdate {
-            val tb = this@TitleBar
-            positionX = tb.renderPositionX + tb.renderWidth * 0.5 - textWidth * 0.5
-            positionY = tb.renderPositionY + tb.renderHeight * 0.5 - textHeight * 0.5
-        }
+        overrideX { tb.renderPositionX + tb.renderWidth * 0.5 - textWidth * 0.5 }
+        overrideY { tb.renderPositionY + tb.renderHeight * 0.5 - textHeight * 0.5 }
     }
 
     private var dragOffset: Vec2d? = null

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

@@ -24,7 +24,7 @@ open class Window(
     owner: Layout,
     initialTitle: String = "Untitled",
     initialPosition: Vec2d = Vec2d.ZERO,
-    initialSize: Vec2d = Vec2d(115.0, 300.0),
+    initialSize: Vec2d = Vec2d(120.0, 300.0),
     draggable: Boolean = true,
     scrollable: Boolean = true,
     private val minimizing: Minimizing = Minimizing.Relative,
@@ -228,7 +228,8 @@ open class Window(
          *
          * @param draggable Whether to allow user to drag the window
          *
-         * @param scrollable Whether to allow user to scroll the elements
+         * @param scrollable Whether to let user scroll the content
+         * This will also make your elements be vertically ordered
          *
          * @param minimizing The [Minimizing] mode.
          *
@@ -241,7 +242,7 @@ open class Window(
         @UIBuilder
         fun Layout.window(
             position: Vec2d = Vec2d.ZERO,
-            size: Vec2d = Vec2d(115.0, 300.0),
+            size: Vec2d = Vec2d(120.0, 300.0),
             title: String = "Untitled",
             draggable: Boolean = true,
             scrollable: Boolean = true,

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

@@ -8,7 +8,7 @@ import kotlin.math.abs
 
 class WindowContent(
     owner: Window,
-    scrollable: Boolean
+    private val scrollable: Boolean
 ) : Layout(owner, false, true) {
     private val animation = animationTicker(false)
 
@@ -48,9 +48,7 @@ class WindowContent(
             if (abs(rubberbandDelta) < 0.05) rubberbandDelta = 0.0
 
             animation.tick()
-        }
 
-        onRender {
             reorderChildren()
         }
 
@@ -61,22 +59,24 @@ class WindowContent(
     }
 
     private fun reorderChildren() {
-        // Skip for closed windows
-        if (renderHeight < 0.1) return
-
-        var offset = renderScrollOffset + NewCGui.padding
-
-        children.forEach { child ->
-            child.positionY = renderPositionY + offset
-            offset += child.renderHeight + NewCGui.listStep
+        if (!scrollable) return
+
+        children.forEachIndexed { i, child ->
+            val prev by lazy { children[i - 1] }
+
+            child.overrideY {
+                if (i == 0) {
+                    renderPositionY + renderScrollOffset + NewCGui.padding
+                } else {
+                    prev.renderPositionY + prev.renderHeight + NewCGui.listStep
+                }
+            }
         }
     }
 
     fun getContentHeight(): Double {
-        val c = children
-
-        val components = c.sumOf(Layout::renderHeight)
-        val step = NewCGui.listStep * (c.size - 1).coerceAtLeast(0)
+        val components = children.sumOf(Layout::renderHeight)
+        val step = NewCGui.listStep * (children.size - 1).coerceAtLeast(0)
         val padding = NewCGui.padding * 2
 
         return components + step + padding
@@ -87,6 +87,7 @@ class WindowContent(
          * Creates an empty [WindowContent] component
          *
          * @param scrollable Whether to let user scroll this layout
+         * This will also make your elements be vertically ordered
          */
         @UIBuilder
         fun Window.windowContent(scrollable: Boolean) =

common/src/main/kotlin/com/lambda/newgui/impl/clickgui/ModuleLayout.kt

@@ -42,10 +42,9 @@ class ModuleLayout(
         with(titleBar) {
             with(textField) {
                 bold = false
-                horizontalAlignment = HAlign.LEFT
 
-                onUpdate {
-                    positionX = titleBar.renderPositionX + (titleBar.renderHeight - textHeight) * 0.5
+                overrideX {
+                    titleBar.renderPositionX + (titleBar.renderHeight - textHeight) * 0.5
                 }
             }
 
@@ -65,12 +64,12 @@ class ModuleLayout(
         }
 
         titleBarRect.onUpdate {
-            setColor(lerp(enableAnimation, NewCGui.titleBackgroundColor.multAlpha(0.15), NewCGui.titleBackgroundColor))
+            setColor(lerp(enableAnimation, NewCGui.moduleDisabledColor, NewCGui.moduleEnabledColor))
             correctRadius()
         }
 
         contentRect.onUpdate {
-            setColor(lerp(enableAnimation, NewCGui.backgroundColor.multAlpha(0.15), NewCGui.backgroundColor))
+            setColor(lerp(enableAnimation, NewCGui.moduleDisabledColor, NewCGui.moduleEnabledColor))
             correctRadius()
         }