Skip to content

Fixed candidate test failures caused by PR #33428. #34515

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

Merged
jfversluis merged 1 commit into from
Mar 18, 2026
+20 −4
Merged

Fixed candidate test failures caused by PR #33428. #34515

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
24 changes: 20 additions & 4 deletions src/Core/src/Platform/Android/MauiWindowInsetListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,26 @@ public MauiWindowInsetListener() : base(DispatchModeStop)
contentView?.SetPadding(0, 0, 0, 0);
}

// Pass insets through unconsumed so child views receive them intact.
// Bottom: BottomNavigationView needs the nav bar inset to extend its background in Edge-to-Edge mode (Issue #33344).
// Top: SafeAreaExtensions handles per-view overlap, avoiding double-padding.
return insets;
// Consume top inset when AppBar is visible — it already pads itself, so downstream
// views must not receive a top inset or SafeAreaExtensions will double-apply it.
// Bottom inset is passed through unconsumed so BottomNavigationView can extend its
// background into the system navigation bar area (issue #33344).
var newSystemBars = Insets.Of(
systemBars?.Left ?? 0,
appBarHasContent ? 0 : systemBars?.Top ?? 0,
systemBars?.Right ?? 0,
systemBars?.Bottom ?? 0) ?? Insets.None;

var newDisplayCutout = Insets.Of(
displayCutout?.Left ?? 0,
appBarHasContent ? 0 : displayCutout?.Top ?? 0,
displayCutout?.Right ?? 0,
displayCutout?.Bottom ?? 0) ?? Insets.None;

return new WindowInsetsCompat.Builder(insets)
?.SetInsets(WindowInsetsCompat.Type.SystemBars(), newSystemBars)
?.SetInsets(WindowInsetsCompat.Type.DisplayCutout(), newDisplayCutout)
?.Build() ?? insets;
}

public void TrackView(AView view)
Expand Down
Loading