Window content layout

Author: bladekt

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

@@ -4,7 +4,6 @@ import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
 import com.lambda.newgui.LambdaScreen.Companion.gui
 import com.lambda.newgui.LambdaScreen.Companion.toScreen
-import com.lambda.newgui.component.window.Window
 import com.lambda.newgui.component.window.Window.Companion.window
 import com.lambda.util.math.Vec2d
 
@@ -15,12 +14,15 @@ object NewCGui : Module(
 ) {
     val titleBarHeight by setting("Title Bar Height", 4.0, 0.0..10.0, 0.1)
     val padding by setting("Padding", 2.0, 0.0..6.0, 0.1)
+    val listStep by setting("List Step", 2.0, 0.0..6.0, 0.1)
 
     private val clickGuiLayout =
         gui {
             window(position = Vec2d.ONE * 20.0, title = "Test window") {
-                content.window(Vec2d.ONE * 5.0, Vec2d.ONE * 60.0) {
+                repeat(6) {
+                    window(Vec2d.ONE * 5.0, Vec2d.ONE * 60.0) {
 
+                    }
                 }
             }
         }

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

@@ -21,10 +21,8 @@ class TextField(
 
     var offset = initialOffset
 
-    // Let user interact through the text
-    override val interactionPassthrough = true
-
     init {
+        properties.interactionPassthrough = true
         verticalAlignment = VAlign.CENTER
         rectUpdate(owner::rect)
 

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

@@ -47,7 +47,7 @@ open class Layout(
     /**
      * The size of this component
      */
-    open var size = Vec2d.ZERO
+    var size = Vec2d.ZERO
 
     /**
      * Horizontal alignment
@@ -81,7 +81,7 @@ open class Layout(
      */
     var position: Vec2d
         get() = ownerRect.leftTop + relativeToAbs(relativePos).let {
-            if (!clampPosition) it
+            if (!properties.clampPosition) it
             else it.coerceIn(
                 0.0, ownerRect.size.x - size.x,
                 0.0, ownerRect.size.y - size.y
@@ -95,6 +95,11 @@ open class Layout(
     private fun relativeToAbs(posIn: Vec2d) = posIn + dockingOffset
     private fun absToRelative(posIn: Vec2d) = posIn - dockingOffset
 
+    /**
+     * Configurable properties of the component
+     */
+    val properties = LayoutProperties()
+
     // Structure
     val children = mutableListOf<Layout>()
     private var selectedChild: Layout? = null
@@ -104,7 +109,6 @@ open class Layout(
     private val isHovered: Boolean get() = mousePosition in rect && (owner?.isHovered ?: true)
 
     // Graphics
-    val animation = AnimationTicker()
     val renderer: RenderLayer = run {
         owner?.let { owner ->
             if (!useBatching || !owner.batchChildren) {
@@ -120,9 +124,6 @@ open class Layout(
 
     private var owningRenderer = false
 
-    protected open val interactionPassthrough = false
-    protected open val clampPosition = false
-
     // Actions
     private var showActions = mutableListOf<() -> Unit>()
     private var hideActions = mutableListOf<() -> Unit>()
@@ -235,15 +236,15 @@ open class Layout(
 
         // Select an element that's on foreground
         selectedChild = if (isHovered) children.lastOrNull {
-            !it.interactionPassthrough && mousePosition in it.rect
+            !it.properties.interactionPassthrough && mousePosition in it.rect
         } else null
 
         // Update children
         children.forEach { child ->
             if (e is GuiEvent.Render) return@forEach
 
             if (e is GuiEvent.MouseClick) {
-                val hovered = child == selectedChild || (child.isHovered && child.interactionPassthrough)
+                val hovered = child == selectedChild || (child.isHovered && child.properties.interactionPassthrough)
                 val newAction = if (hovered) e.action else Mouse.Action.Release
 
                 val newEvent = GuiEvent.MouseClick(e.button, newAction, e.mouse)
@@ -257,7 +258,7 @@ open class Layout(
         when (e) {
             is GuiEvent.Show -> { mousePosition = Vec2d.ONE * -1000.0; showActions.forEach { it() } }
             is GuiEvent.Hide -> { hideActions.forEach { it() } }
-            is GuiEvent.Tick -> { animation.tick(); tickActions.forEach { it() } }
+            is GuiEvent.Tick -> { tickActions.forEach { it() } }
             is GuiEvent.KeyPress -> { keyPressActions.forEach { it(e.key) } }
             is GuiEvent.CharTyped -> { charTypedActions.forEach { it((e.char)) } }
             is GuiEvent.MouseMove -> { mousePosition = e.mouse; mouseMoveActions.forEach { it(e.mouse) } }
@@ -283,9 +284,13 @@ open class Layout(
                     renderer.render()
                 }
 
-                scissor(rect) { // ToDo: merge to ListLayout
+                val postAction = {
                     post.forEach { it.onEvent(e) }
                 }
+
+                if (properties.scissorChildren) {
+                    scissor(rect, postAction)
+                } else postAction()
             }
         }
     }

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

@@ -0,0 +1,18 @@
+package com.lambda.newgui.component.layout
+
+class LayoutProperties {
+    /**
+     * If true, interactions pass through to elements beneath this one.
+     */
+    var interactionPassthrough = false
+
+    /**
+     * If true, this element's rectangle is clamped within parent's bounds.
+     */
+    var clampPosition = false
+
+    /**
+     * If true, children using their own render layer are clipped within this rect.
+     */
+    var scissorChildren = false
+}

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

@@ -0,0 +1,56 @@
+package com.lambda.newgui.component.window
+
+import com.lambda.newgui.component.HAlign
+import com.lambda.newgui.component.core.TextField.Companion.textField
+import com.lambda.newgui.component.core.UIBuilder
+import com.lambda.newgui.component.layout.Layout
+import com.lambda.util.Mouse
+import com.lambda.util.math.Rect
+import com.lambda.util.math.Vec2d
+
+/**
+ * Represents a titlebar component
+ */
+class TitleBar(
+    owner: Window,
+    title: String,
+    drag: Boolean
+) : Layout(owner, true, true) {
+    val textField = textField(title) {
+        horizontalAlignment = HAlign.CENTER
+    }
+
+    private var dragOffset: Vec2d? = null
+
+    init {
+        rectUpdate {
+            Rect(owner.rect.leftTop, owner.rect.rightTop + Vec2d(0.0, renderer.font.getHeight() * 1.5))
+        }
+
+        if (drag) {
+            onShow {
+                dragOffset = null
+            }
+
+            onMouseClick { button: Mouse.Button, action: Mouse.Action ->
+                dragOffset = if (button == Mouse.Button.Left && action == Mouse.Action.Click) {
+                    mousePosition - owner.position
+                } else null
+            }
+
+            onMouseMove { mouse ->
+                dragOffset?.let { drag ->
+                    owner.position = mouse - drag
+                }
+            }
+        }
+    }
+
+    companion object {
+        @UIBuilder
+        fun Window.titleBar(
+            text: String,
+            drag: Boolean
+        ) = TitleBar(this, text, drag).apply(children::add)
+    }
+}