Fixes UIWindow scale handlers + improve close button icon

docs/korge/reference/ui/index.md

@@ -125,7 +125,7 @@ uiImage(Size(120f, 32f), KR.korge.read().slice(), scaleMode = ScaleMode.FIT, con
 
 A draggable, resizable and closeable window.
 
-![img_23.png](img_23.png)
+![img_24.png](img_24.png)
 
 ## `UIProgressBar`
 

korge/src/commonMain/kotlin/korlibs/korge/ui/UIIcons.kt

@@ -0,0 +1,22 @@
+package korlibs.korge.ui
+
+import korlibs.image.atlas.*
+import korlibs.image.bitmap.*
+import korlibs.image.color.*
+import korlibs.image.vector.*
+import korlibs.math.geom.*
+
+object UIIcons {
+    val atlas = MutableAtlasUnit()
+
+    fun createIcon(size: Size = Size(32, 32), block: Context2d.() -> Unit): BmpSlice =
+        atlas.add(Bitmap32(size.width.toInt(), size.height.toInt()).context2d { block() }).slice
+
+    val CROSS = createIcon {
+        val padding = 8
+        stroke(Colors.WHITE, lineWidth = 4f) {
+            line(Point(padding, padding), Point(32 - padding, 32 - padding))
+            line(Point(32 - padding, padding), Point(padding, 32 - padding))
+        }
+    }
+}

korge/src/commonMain/kotlin/korlibs/korge/ui/UIWindow.kt

@@ -5,6 +5,7 @@ import korlibs.image.color.*
 import korlibs.image.text.*
 import korlibs.korge.annotations.*
 import korlibs.korge.input.*
+import korlibs.korge.internal.*
 import korlibs.korge.render.*
 import korlibs.korge.tween.*
 import korlibs.korge.view.*
@@ -14,6 +15,7 @@ import korlibs.memory.*
 import korlibs.render.*
 import korlibs.time.*
 
+
 @KorgeExperimental
 inline fun Container.uiWindow(
     title: String,
@@ -52,7 +54,7 @@ class UIWindow(title: String, size: Size = Size(256, 256)) : UIContainer(size) {
     })
     private val titleContainer = fixedSizeContainer(Size(width, titleHeight))
     private val titleView = titleContainer.textBlock(RichTextData(title), align = TextAlignment.MIDDLE_LEFT).xy(12, 0).size(width, titleHeight)
-    private val closeButton = titleContainer.uiButton("X", size = Size(titleHeight - buttonSeparation * 2, titleHeight - buttonSeparation * 2)) {
+    private val closeButton = titleContainer.uiButton(icon = UIIcons.CROSS, size = Size(titleHeight - buttonSeparation * 2, titleHeight - buttonSeparation * 2)) {
         radiusRatio = Ratio.ONE
         elevation = false
         bgColorOut = MaterialColors.RED_600
@@ -72,8 +74,10 @@ class UIWindow(title: String, size: Size = Size(256, 256)) : UIContainer(size) {
     class ScaleHandler(val window: UIWindow, val anchor: Anchor) {
         val isCorner = (anchor.doubleX == anchor.doubleY)
 
+        @OptIn(KorgeUntested::class)
         val view = window.solidRect(Size.ZERO, Colors.TRANSPARENT) {
             val sh = this
+            val anchor = [email protected]
             anchor(Anchor.CENTER)
             cursor = GameWindow.Cursor.fromAnchorResize(anchor)
             // @TODO: clamping shouldn't affect (we should use it.start and get initial values to compute based on start and not on deltas)
@@ -88,7 +92,7 @@ class UIWindow(title: String, size: Size = Size(256, 256)) : UIContainer(size) {
                         }
                     }
 
-                    anchor.floatY > 0.5f -> {
+                    anchor.floatX > 0.5f -> {
                         bounds = bounds.copyBounds(right = it.cx)
                         bounds = bounds.copy(width = bounds.width.clamp(window.minWidth, window.maxWidth))
                     }
@@ -110,7 +114,10 @@ class UIWindow(title: String, size: Size = Size(256, 256)) : UIContainer(size) {
 
                     else -> Unit
                 }
-                window.setGlobalBounds(bounds.immutable)
+                window.setGlobalBounds(bounds)
+                if (it.end) {
+                    resized()
+                }
             }
         }
 
@@ -125,6 +132,10 @@ class UIWindow(title: String, size: Size = Size(256, 256)) : UIContainer(size) {
             else -> 0f
         }
 
+        private fun resized() {
+            resized(window.widthD, window.heightD)
+        }
+
         fun resized(width: Double, height: Double) {
             view
                 .position(getExpectedX(), getExpectedY())