Skip to content

Fixed FrameMargin being overwritten by OnTitleBarChanged. #1517

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: main
Choose a base branch
from
+1 −3
Open

Fixed FrameMargin being overwritten by OnTitleBarChanged. #1517

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
4 changes: 1 addition & 3 deletions src/Wpf.Ui/Controls/NavigationView/NavigationView.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public partial class NavigationView
nameof(FrameMargin),
typeof(Thickness),
typeof(NavigationView),
new FrameworkPropertyMetadata(default(Thickness))
new FrameworkPropertyMetadata(FrameMarginDefault)
);

/// <summary>
Expand Down Expand Up @@ -650,7 +650,6 @@ private static void OnTitleBarChanged(DependencyObject d, DependencyPropertyChan

if (e.NewValue is null && e.OldValue is TitleBar oldValue)
{
navigationView.FrameMargin = new Thickness(0);
oldValue.Margin = new Thickness(0);

if (navigationView.AutoSuggestBox?.Margin == AutoSuggestBoxMarginDefault)
Expand All @@ -666,7 +665,6 @@ private static void OnTitleBarChanged(DependencyObject d, DependencyPropertyChan
return;
}

navigationView.FrameMargin = FrameMarginDefault;
titleBar.Margin = TitleBarPaneOpenMarginDefault;

if (navigationView.AutoSuggestBox?.Margin is { Bottom: 0, Left: 0, Right: 0, Top: 0 })
Expand Down