Merge pull request #724 from skydoves/fix/width-ratio-compose

Fix the widthRatio doesn't calculate properly in Compose
skydoves · Oct 9, 2024 · fac7dda · fac7dda
2 parents 80a2ef4 + a9a41c1
commit fac7dda
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/balloon-compose/src/main/kotlin/com/skydoves/balloon/compose/Balloon.kt b/balloon-compose/src/main/kotlin/com/skydoves/balloon/compose/Balloon.kt
@@ -132,11 +132,18 @@ public fun Balloon(
           .padding(start = paddingStart, end = paddingEnd)
           .onGloballyPositioned { coordinates ->
             val originalSize = coordinates.size
-            val calculatedWidth = if (originalSize.width > screenWidth) {
-              screenWidth
-            } else {
-              originalSize.width
-            }
+            val calculatedWidth =
+              if (screenWidth * builder.widthRatio != 0f) {
+                (
+                  screenWidth * builder.widthRatio -
+                    with(density) { builder.marginRight.dp.toPx() } -
+                    with(density) { builder.marginLeft.dp.toPx() }
+                  ).toInt()
+              } else if (originalSize.width > screenWidth) {
+                screenWidth
+              } else {
+                originalSize.width
+              }
             val size = IntSize(
               width = calculatedWidth,
               height = coordinates.size.height,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.0"
+agp = "8.6.1"
 dokka = "1.9.20"
 kotlin = "2.0.20"
 kotlinBinaryCompatibility = "0.16.3"