forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 111
Fix consuming window insets in system window insets padding #2665
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.
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
svastven
wants to merge
6
commits into
jb-main
Choose a base branch
from
svastven/consume-window-insets
base: jb-main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+211
−9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MatkovIvan
requested changes
Jan 7, 2026
...ation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/WindowInsetsPadding.kt
Show resolved
Hide resolved
MatkovIvan
reviewed
Jan 7, 2026
...ation-layout/src/commonMain/kotlin/androidx/compose/foundation/layout/WindowInsetsPadding.kt
Outdated
Show resolved
Hide resolved
MatkovIvan
reviewed
Jan 8, 2026
| insetsCalculation: PlatformWindowInsets.() -> WindowInsets, | ||
| ): Modifier = this then | ||
| PlatformInsetsPaddingModifierElement(inspectorInfo) then | ||
| PlatformWindowInsetsPaddingModifierElement(inspectorInfo, insetsCalculation) |
Member
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding both of them works, but kind of suspicious and creates more elements to allocate/iterate/etc 🤔
Just to be informed: what's about these alternatives?
- Delegate
PlatformWindowInsetsProviderNodefromInsetsPaddingModifierNode(not visa versa). - Using
DelegatableNode.visitAncestors(includeDelegates = true)
(1) looks more promising for me. WDYT?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes an issue where window insets (like
statusBarsPadding()) did not correctly respect or propagate consumed window insets. The core problem was that theInsetsPaddingModifierNodelogic was "hidden" from the layout traversal system because it was implemented via delegation.The
Modifier.windowInsetsPaddingnow applies two separate modifiers which create nodes of two types:PlatformInsetsPaddingModifierNodeis anInsetsPaddingModifierNodethat handles actual layout padding and correct resolve of window insets consumed by ancestors.PlatformWindowInsetsPaddingModifierNodeis responsible for retrieving platform-specificWindowInsetsvalues. On attachment, it traverses up the modifier chain to find the ancestorPlatformInsetsPaddingModifierNodeand establishes a link. It provides the insets back up to this ancestor node.Fixes CMP-9390 iOS seems to ignore consumeWindowInsets
Testing
Adds skiko tests to
WindowInsetsTestThis should be tested by QA
Release Notes
Fixes - Multiple Platforms