Fix the centering math in Box on Android (#2406)

The code was incorrectly not subtracting margins off before centering.
cashapp · Oct 23, 2024 · dd96ce1 · dd96ce1
1 parent 294decd
commit dd96ce1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/ViewBox.kt b/redwood-layout-view/src/main/kotlin/app/cash/redwood/layout/view/ViewBox.kt
@@ -298,7 +298,7 @@ private class Measurer {
 
     val left = when {
       horizontalAlignment == CrossAxisAlignment.Center -> {
-        marginLeft + (frameWidth - width) / 2
+        marginLeft + (frameWidth - width - marginWidth) / 2
       }
       alignRight -> {
         (boxMarginStart + frameWidth + boxMarginEnd) - marginRight - width
@@ -308,7 +308,7 @@ private class Measurer {
 
     val top = when (verticalAlignment) {
       CrossAxisAlignment.Center -> {
-        boxMarginTop + marginTop + (frameHeight - height) / 2
+        boxMarginTop + marginTop + (frameHeight - height - marginHeight) / 2
       }
       CrossAxisAlignment.End -> {
         boxMarginTop + frameHeight - marginBottom - height

diff --git a/...images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildExplicitHeight.png b/...images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testChildExplicitHeight.png
diff --git a/...images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testMarginsAndAlignment.png b/...images/app.cash.redwood.layout.view_ViewBoxTest_RTL_testMarginsAndAlignment.png
diff --git a/...ots/images/app.cash.redwood.layout.view_ViewBoxTest_testChildExplicitHeight.png b/...ots/images/app.cash.redwood.layout.view_ViewBoxTest_testChildExplicitHeight.png
diff --git a/...ots/images/app.cash.redwood.layout.view_ViewBoxTest_testMarginsAndAlignment.png b/...ots/images/app.cash.redwood.layout.view_ViewBoxTest_testMarginsAndAlignment.png