Skip to content

Measure toolbar before calculating body's constraints #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Measure toolbar before calculating body's constraints #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/src/main/java/me/onebone/toolbar/CollapsingToolbarScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ fun CollapsingToolbarScaffold(
minWidth = 0,
minHeight = 0
)
// Measuring the toolbar updates toolbarState, which bodyConstraints depends on. Therefore
// the toolbar MUST be measured BEFORE bodyConstraints is computed.
val toolbarPlaceable = measurables[0].measure(toolbarConstraints)

val bodyConstraints = constraints.copy(
minWidth = 0,
minHeight = 0,
Expand All @@ -139,9 +143,6 @@ fun CollapsingToolbarScaffold(
constraints.maxHeight
}
)

val toolbarPlaceable = measurables[0].measure(toolbarConstraints)

val bodyMeasurables = measurables.subList(1, measurables.size)
val childrenAlignments = bodyMeasurables.map {
(it.parentData as? ScaffoldParentData)?.alignment
Expand Down