Corrected scissor usage

Author: bladekt

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

@@ -287,28 +287,31 @@ open class Layout(
                 mouseClickActions.forEach { it(e.button, action) }
             }
             is GuiEvent.Render -> {
-                val drawChildren = rect.size.let { it.x > 0.1 && it.y > 0.1 }
-                val partition by lazy { children.partition { !it.owningRenderer } }
+                val drawAction = {
+                    val drawChildren = rect.size.let { it.x > 0.1 && it.y > 0.1 }
 
-                renderActions.forEach { it(renderer) }
+                    // ToDo: clipping filter to increase performance
+                    // filter { it.rect in this.rect }
+                    val partition by lazy { children.partition { !it.owningRenderer } }
 
-                if (drawChildren) {
-                    partition.first.forEach { it.onEvent(e) }
-                }
+                    renderActions.forEach { it(renderer) }
 
-                if (owningRenderer) {
-                    renderer.render()
-                }
+                    if (drawChildren) {
+                        partition.first.forEach { it.onEvent(e) }
+                    }
 
-                if (drawChildren) {
-                    val postAction = {
-                        partition.second.forEach { it.onEvent(e) }
+                    if (owningRenderer) {
+                        renderer.render()
                     }
 
-                    if (properties.scissorChildren) {
-                        scissor(rect, postAction)
-                    } else postAction()
+                    if (drawChildren) {
+                        partition.second.forEach { it.onEvent(e) }
+                    }
                 }
+
+                if (properties.scissor) {
+                    scissor(rect, drawAction)
+                } else drawAction()
             }
         }
     }

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

@@ -12,7 +12,7 @@ class LayoutProperties {
     var clampPosition = false
 
     /**
-     * If true, children using their own render layer are clipped within this rect.
+     * If true, anything drawn onto this render layer are clipped within this rect.
      */
-    var scissorChildren = false
+    var scissor = false
 }

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

@@ -40,6 +40,7 @@ open class Window(
     }
 
     // Position
+    // ToDo find a way to animate this only when dragging
     /*private val renderX by animation.exp(position::x, 0.8)
     private val renderY by animation.exp(position::y, 0.8)
     private val renderPosition get() = Vec2d(renderX, renderY)*/
@@ -68,11 +69,13 @@ 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)
             }
 
             onMouseClick { button, action ->
+                // Toggle minimizing state when right-clicking title bar
                 if (!minimizable) return@onMouseClick
                 if (button != Mouse.Button.Right || action != Mouse.Action.Click) return@onMouseClick
 
@@ -81,9 +84,10 @@ open class Window(
         }
 
         with(content) {
-            properties.scissorChildren = true
+            properties.scissor = true
 
             onRender {
+                // Update content position
                 rect = Rect(
                     titleBar.rect.leftBottom + NewCGui.padding,
                     this@Window.rect.rightBottom - NewCGui.padding
@@ -103,13 +107,15 @@ open class Window(
         }
 
         onRender {
+            // Render window background
             filled.build(
                 rect,
                 2.0,
                 Color(50, 50, 50),
                 shade = true
             )
 
+            // Render outline
             outline.build(
                 rect,
                 2.0,
@@ -120,6 +126,7 @@ open class Window(
         }
 
         onTick {
+            // Update cursor
             val rxh = resizeXHovered || resizeX != null
             val ryh = resizeYHovered || resizeY != null
 
@@ -134,6 +141,7 @@ open class Window(
         }
 
         onMouseClick { button: Mouse.Button, action: Mouse.Action ->
+            // Update resize dragging offsets
             resizeX = null
             resizeY = null