fix MorhpLayout overlay dimension size

MorphLayout's overlay was growing beyond its maximum constraints.
Passed constraints from MorphSubcomposeLayout to constraint with it

Author: SmartToolFactory

image/src/main/java/com/smarttoolfactory/image/transform/MorphLayout.kt

@@ -10,10 +10,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.*
 
 /**
  * Composable that changes dimensions of its content from handles, translates its position
@@ -24,7 +21,7 @@ import androidx.compose.ui.unit.dp
  * set a **Size** modifier because [MorphSubcomposeLayout] measures with unbounded constraints
  * and size of this composable is changed. If you set a fixed size, size won't be calculated
  * accurately.
- * @param enabled flag for enabling morph operations and boroder and handle display
+ * @param enabled flag for enabling morph operations and border and handle display
  * @param handleRadius radius of circular handles to implement morphing operations
  * @param handlePlacement determines how handles should be placed. They can be placed at corners
  * ot center of each side or both.
@@ -60,7 +57,7 @@ fun MorphLayout(
                 content()
             }
         },
-        dependentContent = { intSize: IntSize ->
+        dependentContent = { intSize: IntSize, constraints: Constraints ->
 
             val dpSize = with(LocalDensity.current) {
                 val rawWidth = intSize.width.toDp()
@@ -72,6 +69,7 @@ fun MorphLayout(
                 handleRadius = handleRadius,
                 enabled = enabled,
                 dpSize = dpSize,
+                constraints = constraints,
                 handlePlacement = handlePlacement,
                 onDown = onDown,
                 onMove = onMove,
@@ -87,16 +85,17 @@ private fun MorphLayout(
     enabled: Boolean = true,
     handleRadius: Dp,
     dpSize: DpSize,
+    constraints: Constraints,
     handlePlacement: HandlePlacement,
     onDown: () -> Unit = {},
     onMove: (DpSize) -> Unit = {},
     onUp: () -> Unit = {},
     content: @Composable () -> Unit
 ) {
 
+    val density = LocalDensity.current
     val touchRegionRadius: Float
     val minDimension: Float
-    val size: Size
 
     val initialSize = remember {
         DpSize(
@@ -109,14 +108,18 @@ private fun MorphLayout(
         mutableStateOf(initialSize)
     }
 
-    with(LocalDensity.current) {
+    with(density) {
         touchRegionRadius = handleRadius.toPx()
-        minDimension = (touchRegionRadius * if (handlePlacement == HandlePlacement.Corner) 4 else 6)
-        size = updatedSize.toSize()
+        minDimension =
+            (touchRegionRadius * if (handlePlacement == HandlePlacement.Corner) 4 else 6)
     }
 
     val rectDraw = remember(updatedSize) {
-        Rect(offset = Offset.Zero, size = size)
+        with(density) {
+            val width = updatedSize.width.toPx().coerceAtMost(constraints.maxWidth.toFloat())
+            val height = updatedSize.height.toPx().coerceAtMost(constraints.maxHeight.toFloat())
+            Rect(offset = Offset.Zero, size = Size(width, height))
+        }
     }
 
     val editModifier = Modifier
@@ -125,6 +128,7 @@ private fun MorphLayout(
             initialSize = initialSize,
             touchRegionRadius = touchRegionRadius,
             minDimension = minDimension,
+            constraints = constraints,
             handlePlacement = handlePlacement,
             onDown = onDown,
             onMove = { dpSizeChange: DpSize ->

image/src/main/java/com/smarttoolfactory/image/transform/MorphModifier.kt

@@ -12,7 +12,9 @@ import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.positionChange
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import com.smarttoolfactory.gesture.pointerMotionEvents
 
@@ -21,15 +23,23 @@ internal fun Modifier.morph(
     initialSize: DpSize,
     touchRegionRadius: Float,
     minDimension: Float,
+    constraints: Constraints,
     handlePlacement: HandlePlacement,
-    onDown: ()->Unit,
+    onDown: () -> Unit,
     onMove: (DpSize) -> Unit,
-    onUp: () ->Unit
+    onUp: () -> Unit
 ) = composed(
     factory = {
 
         val density = LocalDensity.current
 
+        val maxWidth: Dp
+        val maxHeight: Dp
+
+        with(density) {
+            maxWidth = constraints.maxWidth.toDp()
+            maxHeight = constraints.maxHeight.toDp()
+        }
         var updatedSize by remember {
             mutableStateOf(initialSize)
         }
@@ -76,8 +86,11 @@ internal fun Modifier.morph(
                         minDimension,
                         transform,
                         onUpdate = { dpSize, transformChange ->
-                            updatedSize = dpSize
-                            onMove(dpSize)
+                            updatedSize = DpSize(
+                                dpSize.width.coerceAtMost(maxWidth),
+                                dpSize.height.coerceAtMost(maxHeight)
+                            )
+                            onMove(updatedSize)
                             transform = transformChange
                         }
                     )

image/src/main/java/com/smarttoolfactory/image/transform/MorphSubcomposeLayout.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.layout.Placeable
 import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.layout.SubcomposeMeasureScope
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
@@ -31,7 +32,7 @@ internal fun MorphSubcomposeLayout(
     handleRadius: Dp = 15.dp,
     updatePhysicalSize:Boolean =false,
     mainContent: @Composable () -> Unit,
-    dependentContent: @Composable (IntSize) -> Unit
+    dependentContent: @Composable (IntSize, Constraints) -> Unit
 ) {
 
     val handleRadiusInPx = with(LocalDensity.current) {
@@ -62,7 +63,7 @@ internal fun MorphSubcomposeLayout(
         val maxSize = IntSize(maxWidth, maxHeight)
 
         val dependentPlaceables = subcompose(SlotsEnum.Dependent) {
-            dependentContent(maxSize)
+            dependentContent(maxSize, constraints)
         }.map {
             it.measure(constraints)
         }

image/src/main/java/com/smarttoolfactory/image/transform/TranformLayout.kt

@@ -9,11 +9,9 @@ import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.*
 import kotlin.math.abs
+import kotlin.ranges.coerceAtLeast
 
 /**
  * Composable that changes scale of its content from handles, translates its position
@@ -58,15 +56,14 @@ fun TransformLayout(
                 content()
             }
         },
-        dependentContent = { intSize: IntSize ->
+        dependentContent = { intSize: IntSize, constraints: Constraints ->
 
             val dpSize = with(LocalDensity.current) {
                 val rawWidth = intSize.width.toDp()
                 val rawHeight = intSize.height.toDp()
                 DpSize(rawWidth, rawHeight)
             }
 
-            println("Dependent size: $intSize")
             TransformLayout(
                 enabled = enabled,
                 handleRadius = handleRadius,
@@ -119,8 +116,7 @@ private fun TransformLayout(
 //            transform
 //        )
 //    }
-
-
+    
     var rectDraw by remember {
         mutableStateOf(
             Rect(