Titlebar changes, shadow under it

Author: bladekt

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

@@ -12,7 +12,7 @@ object NewCGui : Module(
     description = "ggs",
     defaultTags = setOf(ModuleTag.CLIENT)
 ) {
-    val titleBarHeight by setting("Title Bar Height", 4.0, 0.0..10.0, 0.1)
+    val titleBarHeight by setting("Title Bar Height", 16.0, 0.0..25.0, 0.1)
     val padding by setting("Padding", 2.0, 1.0..6.0, 0.1)
     val listStep by setting("List Step", 2.0, 0.0..6.0, 0.1)
 

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

@@ -1,5 +1,6 @@
 package com.lambda.newgui.component.core
 
+import com.lambda.newgui.component.HAlign
 import com.lambda.newgui.component.VAlign
 import com.lambda.newgui.component.layout.Layout
 import com.lambda.util.math.Vec2d
@@ -52,6 +53,19 @@ class TextField(
     }
 
     companion object {
+        /**
+         * Creates a [TextField] component
+         *
+         * @param text String to draw
+         *
+         * @param color Color of the font
+         *
+         * @param scale Scale of the font
+         *
+         * @param shadow Whether the font should drop a shadow
+         *
+         * @param offset Offset from the corner(specified by [horizontalAlignment]) of the text (ignored for [HAlign.CENTER])
+         */
         @UIBuilder
         fun Layout.textField(
             text: String,

common/src/main/kotlin/com/lambda/newgui/component/layout/Layout.kt

@@ -57,7 +57,7 @@ open class Layout(
     /**
      * The position of the component
      *
-     * Note: actual position could be overridden using [overridePosition], to get actual position [rect].leftTop instead
+     * Note: actual position could be overridden using [overridePosition], to get actual position use [rect].leftTop instead
      */
     var position: Vec2d
         get() = ownerRect.leftTop + relativeToAbs(relativePos).let {
@@ -71,7 +71,7 @@ open class Layout(
     /**
      * The size of this component
      *
-     * Note: actual size could be overridden using [overridePosition], to get actual size [rect].size instead
+     * Note: actual size could be overridden using [overrideSize], to get actual size use [rect].size instead
      */
     var size = Vec2d.ZERO
 

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

@@ -70,8 +70,7 @@ open class Window(
         with(titleBar) {
             onRender {
                 // Update title bar position
-                val heightVec = Vec2d(0.0, textField.textHeight * 1.5)
-                rect = Rect(this@Window.rect.leftTop, this@Window.rect.rightTop + heightVec)
+                rect = Rect(this@Window.rect.leftTop, this@Window.rect.rightTop + Vec2d.BOTTOM * NewCGui.titleBarHeight)
             }
 
             onMouseClick { button, action ->
@@ -89,7 +88,7 @@ open class Window(
             onRender {
                 // Update content position
                 rect = Rect(
-                    titleBar.rect.leftBottom + NewCGui.padding,
+                    titleBar.rect.leftBottom + Vec2d.RIGHT * NewCGui.padding,
                     this@Window.rect.rightBottom - NewCGui.padding
                 )
             }

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

@@ -1,12 +1,14 @@
 package com.lambda.newgui.component.window
 
 import com.lambda.graphics.animation.Animation.Companion.exp
-import com.lambda.graphics.animation.AnimationTicker
 import com.lambda.module.modules.client.NewCGui
 import com.lambda.newgui.component.VAlign
 import com.lambda.newgui.component.core.UIBuilder
 import com.lambda.newgui.component.layout.Layout
+import com.lambda.util.math.Rect
 import com.lambda.util.math.Vec2d
+import com.lambda.util.math.setAlpha
+import java.awt.Color
 import kotlin.math.abs
 
 class WindowContent(
@@ -53,6 +55,15 @@ class WindowContent(
         }
 
         onRender {
+            // Shadow
+            val topColor = Color.BLACK.setAlpha(0.2)
+            val bottomColor = Color.BLACK.setAlpha(0.0)
+            filled.build(
+                Rect(rect.leftTop, rect.rightTop + Vec2d.BOTTOM * 10.0), 0.0,
+                topColor, topColor,
+                bottomColor, bottomColor
+            )
+
             reorderChildren()
         }
 
@@ -66,7 +77,7 @@ class WindowContent(
         // Skip for closed windows
         if (size.y < 0.1) return
 
-        var offset = renderScrollOffset
+        var offset = renderScrollOffset + NewCGui.padding
 
         scrollableChildren.forEach { child ->
             child.position = Vec2d(child.position.x, position.y + offset)
@@ -78,7 +89,7 @@ class WindowContent(
         /**
          * Creates an empty [WindowContent] component
          *
-         * @param scrollable Whether to scroll
+         * @param scrollable Whether to let user scroll this layout
          */
         @UIBuilder
         fun Window.windowContent(scrollable: Boolean) =