Skip to content

Commit 2aee691

Browse files
committed
library: TopAppBar: Always keep InsetsPadding of statusBars & captionBar
1 parent f9694f3 commit 2aee691

File tree

1 file changed

+6
-20
lines changed
  • miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic

1 file changed

+6
-20
lines changed

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/TopAppBar.kt

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@ fun TopAppBar(
156156
scrolledOffset = { scrollBehavior?.state?.heightOffset ?: 0f },
157157
expandedHeightPx = expandedHeightPx,
158158
horizontalPadding = horizontalPadding,
159-
largeTitleHeight = largeTitleHeight,
160-
defaultWindowInsetsPadding = defaultWindowInsetsPadding
159+
largeTitleHeight = largeTitleHeight
161160
)
162161
}
163162
}
@@ -575,8 +574,7 @@ private fun TopAppBarLayout(
575574
scrolledOffset: ScrolledOffset,
576575
expandedHeightPx: Float,
577576
horizontalPadding: Dp,
578-
largeTitleHeight: MutableState<Int>,
579-
defaultWindowInsetsPadding: Boolean
577+
largeTitleHeight: MutableState<Int>
580578
) {
581579
// Subtract the scrolledOffset from the maxHeight. The scrolledOffset is expected to be
582580
// equal or smaller than zero.
@@ -621,21 +619,6 @@ private fun TopAppBarLayout(
621619
Modifier.offset { IntOffset(0, heightOffset) }
622620
}
623621

624-
val statusBarsInsets = WindowInsets.statusBars
625-
val captionBarInsets = WindowInsets.captionBar
626-
627-
val layoutModifier = remember(defaultWindowInsetsPadding, statusBarsInsets, captionBarInsets) {
628-
Modifier
629-
.then(
630-
if (defaultWindowInsetsPadding) {
631-
Modifier
632-
.windowInsetsPadding(statusBarsInsets.only(WindowInsetsSides.Top))
633-
.windowInsetsPadding(captionBarInsets.only(WindowInsetsSides.Top))
634-
} else Modifier
635-
)
636-
.clipToBounds()
637-
}
638-
639622
Layout(
640623
{
641624
Box(
@@ -679,7 +662,10 @@ private fun TopAppBarLayout(
679662
}
680663
}
681664
},
682-
modifier = layoutModifier
665+
modifier = Modifier
666+
.windowInsetsPadding(WindowInsets.statusBars.only(WindowInsetsSides.Top))
667+
.windowInsetsPadding(WindowInsets.captionBar.only(WindowInsetsSides.Top))
668+
.clipToBounds()
683669
) { measurables, constraints ->
684670
val navigationIconPlaceable =
685671
measurables

0 commit comments

Comments
 (0)