refactor: make then after padding for Modifier

2025-09-07 19:14:12 +08:00 · 2023-11-15 23:53:03 +08:00
parent c7d94653ec
commit c31ae99397
1 changed files with 4 additions and 2 deletions
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
@@ -67,13 +67,15 @@ fun Surface(
            backgroundPrimary = colors.backgroundColor,
            textPrimary = colors.contentColor
        )
-    ) { Box(Modifier.surface(colors, style).then(modifier), content = content) }
+    ) { Box(Modifier.surface(colors, style, modifier), content = content) }
 }

 private fun Modifier.surface(
    colors: SurfaceColors,
-    style: SurfaceStyle
+    style: SurfaceStyle,
+    modifier: Modifier
 ) = background(colors.backgroundColor)
+    .then(modifier)
    .padding(
        top = style.topPadding.orElse() ?: style.padding,
        start = style.startPadding.orElse() ?: style.padding,