Update UIContainerLayouts.kt so graphics{} work better (#2166)

* Update UIContainerLayouts.kt so graphics{} work better * fix for horizontal stack + tests
korlibs · Mar 26, 2024 · 387fa55 · 387fa55
1 parent 9e95cf7
commit 387fa55
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/korge/src/korlibs/korge/ui/UIContainerLayouts.kt b/korge/src/korlibs/korge/ui/UIContainerLayouts.kt
@@ -172,7 +172,8 @@ open class UIVerticalStack(
         forEachChild {
             it.y = y
             if (adjustSize && forcedWidth != null) it.scaledWidth = width
-            y += it.height + padding
+            val bounds = it.getLocalBounds()
+            y += bounds.bottom + padding
             bb += it.getBounds(this@UIVerticalStack)
         }
         unscaledSize = Size(if (forcedWidth == null) bb.xmax else forcedWidth!!, y)
@@ -206,7 +207,8 @@ open class UIHorizontalStack(
         forEachChild {
             it.x = x
             if (adjustSize && forcedHeight != null) it.scaledHeight = height
-            x += it.width + padding
+            val bounds = it.getLocalBounds()
+            x += bounds.right + padding
             bb += it.getBounds(this@UIHorizontalStack)
         }
         //println("forcedHeight=$forcedHeight!")

diff --git a/korge/test/korlibs/korge/ui/UIContainerLayoutsTest.kt b/korge/test/korlibs/korge/ui/UIContainerLayoutsTest.kt
@@ -3,6 +3,7 @@ package korlibs.korge.ui
 import korlibs.image.color.*
 import korlibs.korge.view.*
 import korlibs.math.geom.*
+import korlibs.number.*
 import kotlin.test.*
 
 class UIContainerLayoutsTest {
@@ -111,4 +112,24 @@ class UIContainerLayoutsTest {
             ).joinToString("\n")
         )
     }
+
+    @Test
+    fun testUIVerticalStack() {
+        val stack = UIVerticalStack()
+        val view1 = stack.solidRect(10, 10, Colors.RED)
+        val view2 = stack.graphics { fill(Colors.RED) { rect(10, 10, 20, 20) } }
+        val view3 = stack.solidRect(10, 10, Colors.RED)
+        stack.relayout()
+        assertEquals("0,10,40", "${view1.y.niceStr},${view2.y.niceStr},${view3.y.niceStr}")
+    }
+
+    @Test
+    fun testUIHorizontalStack() {
+        val stack = UIHorizontalStack()
+        val view1 = stack.solidRect(10, 10, Colors.RED)
+        val view2 = stack.graphics { fill(Colors.RED) { rect(10, 10, 20, 20) } }
+        val view3 = stack.solidRect(10, 10, Colors.RED)
+        stack.relayout()
+        assertEquals("0,10,40", "${view1.x.niceStr},${view2.x.niceStr},${view3.x.niceStr}")
+    }
 }