Skip to content

Commit 26f214b

Browse files
committed
Rename StyleScope.padding to margin and ensure its visual consistency on desktop and web
1 parent 1987b57 commit 26f214b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

compose-multiplatform-common/src/commonMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ expect class ModifierOrAttrsScope<out TElement : Element> {
1212
}
1313

1414
expect class StyleScope {
15-
fun padding(value: SizeValue)
15+
fun margin(value: SizeValue)
1616
}
1717

1818
/*

compose-multiplatform-common/src/jsMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScope.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.huanshankeji.compose.ui
22

33
import com.huanshankeji.compose.ui.unit.SizeValue
44
import org.jetbrains.compose.web.attributes.AttrsScope
5-
import org.jetbrains.compose.web.css.padding
5+
import org.jetbrains.compose.web.css.margin
66
import org.jetbrains.compose.web.dom.AttrBuilderContext
77
import org.w3c.dom.HTMLElement
88

@@ -20,6 +20,6 @@ actual class ModifierOrAttrsScope<out TElement : Element>(val attrsScope: AttrsS
2020
}
2121

2222
actual class StyleScope(val styleScope: org.jetbrains.compose.web.css.StyleScope) {
23-
actual fun padding(value: SizeValue) =
24-
styleScope.padding(value.platformValue)
23+
actual fun margin(value: SizeValue) =
24+
styleScope.margin(value.platformValue)
2525
}

compose-multiplatform-common/src/jvmMain/kotlin/com/huanshankeji/compose/ui/ModifierOrAttrsScopeJvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ actual class ModifierOrAttrsScope<out TElement : Element>(modifier: Modifier) {
3030
}
3131

3232
actual class StyleScope(val modifierOrAttrsScope: ModifierOrAttrsScope<*>) {
33-
actual fun padding(value: SizeValue) = modifierOrAttrsScope.modify {
33+
actual fun margin(value: SizeValue) = modifierOrAttrsScope.modify {
3434
padding(value.platformValue)
3535
}
3636
}

demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Composables.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fun App() {
2121
}) {
2222
Card({
2323
style {
24-
padding(16.dpOrPx)
24+
margin(16.dpOrPx)
2525
}
2626
}) {
2727
Column {
@@ -40,7 +40,7 @@ fun App() {
4040

4141
Box({
4242
style {
43-
padding(16.dpOrPx)
43+
margin(16.dpOrPx)
4444
}
4545
}) {
4646
List {

0 commit comments

Comments
 (0)