Skip to content

Fix app title bar gap beneath the caption buttons #2051

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 4 commits into
base: main
Choose a base branch
from
Open

Fix app title bar gap beneath the caption buttons #2051

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4162ee
Fix titlebar gap under caption buttons
AndrewKeepCoding Sep 17, 2025
b148634
Revert "Fix titlebar gap under caption buttons"
AndrewKeepCoding Sep 19, 2025
0f16190
Adjust NavigationView margin based on window state
AndrewKeepCoding Sep 19, 2025
5f5a9fa
Merge branch 'main' into app-titlebar-gap-fix
AndrewKeepCoding Sep 29, 2025
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
23 changes: 23 additions & 0 deletions WinUIGallery/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,35 @@ public NavigationView NavigationView

public Action NavigationViewLoaded { get; set; }

private OverlappedPresenter WindowPresenter { get; init; }

private OverlappedPresenterState CurrentWindowState { get; set; }

public MainWindow()
{
this.InitializeComponent();
SetWindowProperties();
RootGrid.ActualThemeChanged += (_, _) => TitleBarHelper.ApplySystemThemeToCaptionButtons(this, RootGrid.ActualTheme);
dispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();

WindowPresenter = AppWindow.Presenter as OverlappedPresenter;
CurrentWindowState = WindowPresenter.State;
AdjustNavigationViewMargin(force: true);
AppWindow.Changed += (_, _) => AdjustNavigationViewMargin();
}

// Adjusts the NavigationView margin based on the window state to fix the gap between the caption buttons and the NavigationView.
private void AdjustNavigationViewMargin(bool? force = null)
{
if (WindowPresenter.State == CurrentWindowState && force is not true)
{
return;
}

NavigationView.Margin = WindowPresenter.State == OverlappedPresenterState.Maximized
? new Thickness(0, -1, 0, 0)
: new Thickness(0, -2, 0, 0);
CurrentWindowState = WindowPresenter.State;
}

private void RootGrid_Loaded(object sender, RoutedEventArgs e)
Expand Down