Merge branch 'engine-scalling' into main-scene-v2

Author: Reco1I

src/com/reco1l/andengine/buffered/UIBufferedComponent.kt

@@ -83,6 +83,11 @@ abstract class UIBufferedComponent<T: IBuffer> : UIComponent() {
 
     //region Draw pipeline
 
+    override fun onSizeChanged() {
+        super.onSizeChanged()
+        requestNewBuffer()
+    }
+
     override fun onHandleInvalidations() {
 
         if (needsNewBuffer) {

src/com/reco1l/andengine/container/UIConstraintContainer.kt

@@ -36,7 +36,7 @@ open class UIConstraintContainer : UIContainer() {
             val targetHeight = target.transformedHeight
 
             val cancelledX = padding.left + child.anchorPositionX
-            val cancelledY = padding.right + child.anchorPositionY
+            val cancelledY = padding.top + child.anchorPositionY
 
             child.x = -cancelledX + targetX + targetWidth * child.anchor.x
             child.y = -cancelledY + targetY + targetHeight * child.anchor.y

src/com/reco1l/andengine/container/UIContainer.kt

@@ -27,8 +27,20 @@ open class UIContainer : UIComponent() {
                 val x = max(0f, child.absoluteX)
                 val y = max(0f, child.absoluteY)
 
-                contentWidth = max(contentWidth, x + child.width)
-                contentHeight = max(contentHeight, y + child.height)
+                // Use intrinsic size when child has relative sizing to avoid circular dependencies
+                val childWidth = if (child is UIComponent && child.rawWidth in Size.relativeSizeRange) {
+                    child.intrinsicWidth
+                } else {
+                    child.width
+                }
+                val childHeight = if (child is UIComponent && child.rawHeight in Size.relativeSizeRange) {
+                    child.intrinsicHeight
+                } else {
+                    child.height
+                }
+
+                contentWidth = max(contentWidth, x + childWidth)
+                contentHeight = max(contentHeight, y + childHeight)
             }
         }
 

src/com/reco1l/andengine/container/UILinearContainer.kt

@@ -2,6 +2,7 @@ package com.reco1l.andengine.container
 
 import com.reco1l.andengine.component.*
 import com.reco1l.andengine.container.Orientation.*
+import com.reco1l.andengine.theme.Size
 import kotlin.math.*
 
 open class UILinearContainer : UIContainer() {
@@ -35,13 +36,16 @@ open class UILinearContainer : UIContainer() {
                 continue
             }
 
+            val childWidth = if (child.rawWidth in Size.relativeSizeRange) child.intrinsicWidth else child.width
+            val childHeight = if (child.rawHeight in Size.relativeSizeRange) child.intrinsicHeight else child.height
+
             when (orientation) {
 
                 Horizontal -> {
                     child.x = contentWidth
 
-                    contentWidth += child.width
-                    contentHeight = max(contentHeight, child.height)
+                    contentWidth += childWidth
+                    contentHeight = max(contentHeight, childHeight)
 
                     if (childCount > 1 && i < childCount - 1) {
                         contentWidth += spacing
@@ -51,8 +55,8 @@ open class UILinearContainer : UIContainer() {
                 Vertical -> {
                     child.y = contentHeight
 
-                    contentWidth = max(contentWidth, child.width)
-                    contentHeight += child.height
+                    contentWidth = max(contentWidth, childWidth)
+                    contentHeight += childHeight
 
                     if (childCount > 1 && i < childCount - 1) {
                         contentHeight += spacing

src/com/reco1l/andengine/theme/Units.kt

@@ -45,7 +45,7 @@ val Int.srem: Float
 
 /**
  * Indicates that this float value is in percentage units.
- * It will be converted to a value between -4 and -3.
+ * It will be converted to a value between -3 and -2.
  */
 val Float.pct: Float
     get() = Size.relativeSizeRange.start + this.coerceAtLeast(0f).coerceAtMost(1f)

src/com/reco1l/andengine/ui/UIDropdown.kt

@@ -67,6 +67,7 @@ class UIDropdown(var trigger: UIComponent) : UIScrollableContainer() {
         scaleY = 0f
 
         optionsContainer = linearContainer {
+            width = Size.Full
             orientation = Orientation.Vertical
             shrink = false
             style = {
@@ -82,10 +83,24 @@ class UIDropdown(var trigger: UIComponent) : UIScrollableContainer() {
 
         if (isExpanded) {
             val (sceneSpaceX, sceneSpaceY) = trigger.convertLocalToSceneCoordinates(0f, trigger.height)
+            val (_, triggerTopY) = trigger.convertLocalToSceneCoordinates(0f, 0f)
+
+            val spaceBelow = parent.height - sceneSpaceY
+            val expandUpwards = triggerTopY > spaceBelow && spaceBelow < optionsContainer.height
 
             x = sceneSpaceX
-            y = sceneSpaceY
-            maxHeight = min(optionsContainer.height, parent.height - sceneSpaceY)
+
+            if (expandUpwards) {
+                y = triggerTopY - min(optionsContainer.height, triggerTopY)
+                scaleCenter = Anchor.BottomCenter
+                maxHeight = min(optionsContainer.height, triggerTopY)
+            } else {
+                y = sceneSpaceY
+                scaleCenter = Anchor.TopCenter
+                maxHeight = min(optionsContainer.height, spaceBelow)
+            }
+
+            minWidth = trigger.width
         }
 
         super.onManagedDraw(gl, camera)