提供正确的底部边距

This commit is contained in:
HapeLee
2026-05-14 00:37:43 +08:00
parent 9dda4dfae7
commit e4487d6c9f
@@ -89,18 +89,22 @@ fun AppScaffold(
containerColor = miuixContainerColor, containerColor = miuixContainerColor,
contentWindowInsets = contentWindowInsets contentWindowInsets = contentWindowInsets
) { paddingValues -> ) { paddingValues ->
val topPadding = PaddingValues(top = paddingValues.calculateTopPadding()) val scaffoldPadding = if (ThemeConfig.useFloatingBottomBar) {
PaddingValues(top = paddingValues.calculateTopPadding())
} else {
paddingValues
}
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.responsiveHazeSource(hazeState) .responsiveHazeSource(hazeState)
.then( .then(
if (contentDrawsBehindBars) Modifier if (contentDrawsBehindBars) Modifier
else Modifier.padding(topPadding) else Modifier.padding(scaffoldPadding)
) )
) { ) {
content( content(
if (contentDrawsBehindBars) topPadding if (contentDrawsBehindBars) scaffoldPadding
else PaddingValues(0.dp) else PaddingValues(0.dp)
) )
} }
@@ -124,18 +128,22 @@ fun AppScaffold(
contentColor = contentColor, contentColor = contentColor,
contentWindowInsets = contentWindowInsets contentWindowInsets = contentWindowInsets
) { paddingValues -> ) { paddingValues ->
val topPadding = PaddingValues(top = paddingValues.calculateTopPadding()) val scaffoldPadding = if (ThemeConfig.useFloatingBottomBar) {
PaddingValues(top = paddingValues.calculateTopPadding())
} else {
paddingValues
}
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.responsiveHazeSource(hazeState) .responsiveHazeSource(hazeState)
.then( .then(
if (contentDrawsBehindBars) Modifier if (contentDrawsBehindBars) Modifier
else Modifier.padding(topPadding) else Modifier.padding(scaffoldPadding)
) )
) { ) {
content( content(
if (contentDrawsBehindBars) topPadding if (contentDrawsBehindBars) scaffoldPadding
else PaddingValues(0.dp) else PaddingValues(0.dp)
) )
} }