From 097f774cdf2f5a88abf6614d8e471a837923e884 Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com> Date: Wed, 3 Aug 2022 16:38:09 +0600 Subject: [PATCH 1/5] combined navigation compact into navigation fluent --- .../Views/Windows/ExperimentalWindow.xaml | 10 +- .../Views/Windows/TaskManagerWindow.xaml | 4 +- src/Wpf.Ui/Controls/NavigationCompact.cs | 68 --- src/Wpf.Ui/Controls/NavigationFluent.bmp | Bin 824 -> 0 bytes src/Wpf.Ui/Controls/NavigationFluent.cs | 68 ++- .../Styles/Controls/NavigationCompact.xaml | 408 ---------------- .../Styles/Controls/NavigationFluent.xaml | 457 +++++++++++------- .../Styles/Controls/NavigationView.xaml | 2 +- src/Wpf.Ui/Styles/Wpf.Ui.xaml | 1 - src/Wpf.Ui/Wpf.Ui.csproj | 2 - 10 files changed, 353 insertions(+), 667 deletions(-) delete mode 100644 src/Wpf.Ui/Controls/NavigationCompact.cs delete mode 100644 src/Wpf.Ui/Controls/NavigationFluent.bmp delete mode 100644 src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml diff --git a/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml index f8b8688ca..65cfe0489 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml +++ b/src/Wpf.Ui.Demo/Views/Windows/ExperimentalWindow.xaml @@ -24,18 +24,20 @@ - - + - - + + - -/// Modern navigation styled similar to the Task Manager in Windows 11. -/// -[ToolboxItem(true)] -[ToolboxBitmap(typeof(NavigationCompact), "NavigationCompact.bmp")] -public class NavigationCompact : Wpf.Ui.Controls.Navigation.NavigationBase -{ - /// - /// Property for . - /// - public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( - nameof(IsExpanded), - typeof(bool), typeof(NavigationCompact), - new PropertyMetadata(false)); - - /// - /// Property for . - /// - public static readonly DependencyProperty TemplateButtonCommandProperty = - DependencyProperty.Register(nameof(TemplateButtonCommand), - typeof(Common.IRelayCommand), typeof(NavigationCompact), new PropertyMetadata(null)); - - /// - /// Gets or sets a value indicating whether the menu is expanded. - /// - public bool IsExpanded - { - get => (bool)GetValue(IsExpandedProperty); - set => SetValue(IsExpandedProperty, value); - } - - /// - /// Command triggered after clicking the button. - /// - public Common.IRelayCommand TemplateButtonCommand => (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty); - - /// - /// Creates new instance and sets default . - /// - public NavigationCompact() : base() => - SetValue(TemplateButtonCommandProperty, new Common.RelayCommand(o => Button_OnClick(this, o))); - - private void Button_OnClick(object sender, object parameter) - { - if (parameter == null) - return; - - string param = parameter as string ?? String.Empty; - -#if DEBUG - System.Diagnostics.Debug.WriteLine($"INFO: {typeof(NavigationCompact)} button clicked with param: {param}", "Wpf.Ui.NavigationCompact"); -#endif - if (param == "hamburger") - IsExpanded = !IsExpanded; - } -} diff --git a/src/Wpf.Ui/Controls/NavigationFluent.bmp b/src/Wpf.Ui/Controls/NavigationFluent.bmp deleted file mode 100644 index 930c735ad4874d8c525cdccac8ecfceef3be6ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 824 zcmZ?rwP0od12Z700mK4O%*Y@C7H0y=3voj*SO7@;XZSy;&^OY76VZTlv%irVIAmBs SwDX + /// Property for . + /// + public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( + nameof(IsExpanded), + typeof(bool), typeof(NavigationFluent), + new PropertyMetadata(true)); + + /// + /// Property for . + /// + public static readonly DependencyProperty IsExpandButtonVisibleProperty = DependencyProperty.Register( + nameof(IsExpandButtonVisible), + typeof(bool), typeof(NavigationFluent), + new PropertyMetadata(false)); + + /// + /// Property for . + /// + public static readonly DependencyProperty TemplateButtonCommandProperty = + DependencyProperty.Register(nameof(TemplateButtonCommand), + typeof(Common.IRelayCommand), typeof(NavigationFluent), new PropertyMetadata(null)); + + /// + /// Gets or sets a value indicating whether the menu is expanded. + /// + public bool IsExpanded + { + get => (bool)GetValue(IsExpandedProperty); + set => SetValue(IsExpandedProperty, value); + } + + /// + /// TODO + /// + public bool IsExpandButtonVisible + { + get => (bool)GetValue(IsExpandButtonVisibleProperty); + set => SetValue(IsExpandButtonVisibleProperty, value); + } + + /// + /// Command triggered after clicking the button. + /// + public Common.IRelayCommand TemplateButtonCommand => (Common.IRelayCommand)GetValue(TemplateButtonCommandProperty); + + /// + /// Creates new instance and sets default . + /// + public NavigationFluent() : base() => + SetValue(TemplateButtonCommandProperty, new Common.RelayCommand(o => Button_OnClick(this, o))); + + private void Button_OnClick(object sender, object parameter) + { + if (parameter == null) + return; + + string param = parameter as string ?? String.Empty; + +#if DEBUG + System.Diagnostics.Debug.WriteLine($"INFO: {typeof(NavigationFluent)} button clicked with param: {param}", "Wpf.Ui.NavigationFluent"); +#endif + if (param == "hamburger") + IsExpanded = !IsExpanded; + } } diff --git a/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml b/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml deleted file mode 100644 index 9f25a1c0e..000000000 --- a/src/Wpf.Ui/Styles/Controls/NavigationCompact.xaml +++ /dev/null @@ -1,408 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml b/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml index 2105adc07..56ecc1de1 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationFluent.xaml @@ -8,16 +8,160 @@ + xmlns:controls="clr-namespace:Wpf.Ui.Controls" + xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation"> - + + + + diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml index 7453eb9a9..520e50c87 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml @@ -22,7 +22,7 @@ - diff --git a/src/Wpf.Ui/Styles/Wpf.Ui.xaml b/src/Wpf.Ui/Styles/Wpf.Ui.xaml index f1258ed10..ed5d3a8b1 100644 --- a/src/Wpf.Ui/Styles/Wpf.Ui.xaml +++ b/src/Wpf.Ui/Styles/Wpf.Ui.xaml @@ -29,7 +29,6 @@ - diff --git a/src/Wpf.Ui/Wpf.Ui.csproj b/src/Wpf.Ui/Wpf.Ui.csproj index c723d1d40..6de2d93f0 100644 --- a/src/Wpf.Ui/Wpf.Ui.csproj +++ b/src/Wpf.Ui/Wpf.Ui.csproj @@ -86,7 +86,6 @@ - @@ -124,7 +123,6 @@ - From 9b99b242dc35bd58cc2b054ca9fb0cb891075abc Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com> Date: Wed, 3 Aug 2022 18:24:23 +0600 Subject: [PATCH 2/5] implemented NavigationView --- .../Views/Windows/TaskManagerWindow.xaml | 57 ++------ .../Views/Windows/TaskManagerWindow.xaml.cs | 8 +- src/Wpf.Ui/Controls/NavigationView.cs | 73 ++++++----- .../Styles/Controls/NavigationView.xaml | 124 ++++++++---------- 4 files changed, 103 insertions(+), 159 deletions(-) diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml index ea69eba0c..cb06208a7 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml +++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml @@ -3,14 +3,13 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Wpf.Ui.Demo.Views.Windows" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:pages="clr-namespace:Wpf.Ui.Demo.Views.Pages" xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" + xmlns:viewModels="clr-namespace:Wpf.Ui.Demo.ViewModels" Title="WPF UI - MS Store Window" Width="1200" Height="654" - d:DataContext="{d:DesignInstance local:TaskManagerWindow, + d:DataContext="{d:DesignInstance viewModels:TaskManagerViewModel, IsDesignTimeCreatable=True}" d:DesignHeight="650" d:DesignWidth="900" @@ -21,52 +20,20 @@ WindowStartupLocation="CenterScreen" mc:Ignorable="d"> - - - - - - + + + + + - - - - - - - - - - - - - diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs index 0a1df2013..ffa70d476 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs +++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml.cs @@ -12,15 +12,9 @@ namespace Wpf.Ui.Demo.Views.Windows; /// public partial class TaskManagerWindow { - public TaskManagerViewModel ViewModel - { - get; - } - public TaskManagerWindow(TaskManagerViewModel viewModel) { - ViewModel = viewModel; - DataContext = this; + DataContext = viewModel; InitializeComponent(); } diff --git a/src/Wpf.Ui/Controls/NavigationView.cs b/src/Wpf.Ui/Controls/NavigationView.cs index 855dddee4..944553316 100644 --- a/src/Wpf.Ui/Controls/NavigationView.cs +++ b/src/Wpf.Ui/Controls/NavigationView.cs @@ -5,7 +5,6 @@ using System.Windows; using System.Windows.Controls; -using Wpf.Ui.Common; using Wpf.Ui.Controls.Interfaces; namespace Wpf.Ui.Controls; @@ -13,58 +12,60 @@ namespace Wpf.Ui.Controls; /// /// Ready navigation that includes a control, and . /// -[TemplatePart(Name = "PART_Navigation", Type = typeof(Wpf.Ui.Controls.Navigation.NavigationBase))] -[TemplatePart(Name = "PART_Breadcrumb", Type = typeof(Wpf.Ui.Controls.Breadcrumb))] [TemplatePart(Name = "PART_Frame", Type = typeof(System.Windows.Controls.Frame))] public class NavigationView : System.Windows.Controls.Control { - /// - /// Template element represented by the PART_Popup name. - /// - private const string ElementNavigation = "PART_Navigation"; + public static readonly DependencyProperty NavigationProperty = DependencyProperty.Register(nameof(Navigation), + typeof(INavigation), typeof(NavigationView), + new PropertyMetadata(null)); - /// - /// Template element represented by the PART_Popup name. - /// - private const string ElementBreadcrumb = "PART_Breadcrumb"; + public static readonly DependencyProperty BreadcrumbMarginProperty = DependencyProperty.Register(nameof(BreadcrumbMargin), + typeof(Thickness), typeof(NavigationView), + new PropertyMetadata(new Thickness(18, 18, 18, 18))); - /// - /// Template element represented by the PART_Popup name. - /// - private const string ElementFrame = "PART_Frame"; + public static readonly DependencyProperty FrameMarginProperty = DependencyProperty.Register(nameof(FrameMargin), + typeof(Thickness), typeof(NavigationView), + new PropertyMetadata(new Thickness(18, 0, 18, 0))); - public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(nameof(Type), - typeof(NavigationType), typeof(NavigationView), - new PropertyMetadata(NavigationType.Compact)); + public static readonly DependencyProperty IsBackButtonVisibleProperty = DependencyProperty.Register(nameof(IsBackButtonVisible), + typeof(bool), typeof(NavigationView), + new PropertyMetadata(false)); - /// - /// Navigation control. - /// - public INavigation Navigation { get; protected set; } + public INavigation Navigation + { + get => (INavigation)GetValue(NavigationProperty); + set => SetValue(NavigationProperty, value); + } + + public Thickness BreadcrumbMargin + { + get => (Thickness)GetValue(BreadcrumbMarginProperty); + set => SetValue(BreadcrumbMarginProperty, value); + } + + public Thickness FrameMargin + { + get => (Thickness)GetValue(BreadcrumbMarginProperty); + set => SetValue(BreadcrumbMarginProperty, value); + } - /// - /// Navigation breadcrumb. - /// - public Breadcrumb Breadcrumb { get; protected set; } + + public bool IsBackButtonVisible + { + get => (bool)GetValue(FrameMarginProperty); + set => SetValue(FrameMarginProperty, value); + } /// /// Navigation frame /// public Frame Frame { get; protected set; } - public NavigationType Type - { - get => (NavigationType)GetValue(TypeProperty); - set => SetValue(TypeProperty, value); - } - - /// public override void OnApplyTemplate() { base.OnApplyTemplate(); + Frame = GetTemplateChild("PART_Frame") as Frame; - Navigation = GetTemplateChild(ElementNavigation) as INavigation; - Breadcrumb = GetTemplateChild(ElementBreadcrumb) as Breadcrumb; - Frame = GetTemplateChild(ElementFrame) as Frame; + Navigation.Frame = Frame; } } diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml index 520e50c87..18dd94206 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml @@ -8,84 +8,66 @@ + xmlns:controls="clr-namespace:Wpf.Ui.Controls" + xmlns:navigation="clr-namespace:Wpf.Ui.Controls.Navigation"> \ No newline at end of file From 5ea99c69831fe0cd754f43e9730ec8e7f07af5dd Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com> Date: Fri, 5 Aug 2022 07:48:27 +0600 Subject: [PATCH 3/5] added IsBreadcrumbVisible property --- .../Views/Windows/TaskManagerWindow.xaml | 2 +- src/Wpf.Ui/Controls/NavigationView.cs | 19 ++++++++++++++----- .../Styles/Controls/NavigationView.xaml | 7 ++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml index cb06208a7..92198ca90 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml +++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml @@ -20,7 +20,7 @@ WindowStartupLocation="CenterScreen" mc:Ignorable="d"> - + (INavigation)GetValue(NavigationProperty); @@ -45,15 +49,20 @@ public Thickness BreadcrumbMargin public Thickness FrameMargin { - get => (Thickness)GetValue(BreadcrumbMarginProperty); - set => SetValue(BreadcrumbMarginProperty, value); + get => (Thickness)GetValue(FrameMarginProperty); + set => SetValue(FrameMarginProperty, value); } - public bool IsBackButtonVisible { - get => (bool)GetValue(FrameMarginProperty); - set => SetValue(FrameMarginProperty, value); + get => (bool)GetValue(IsBackButtonVisibleProperty); + set => SetValue(IsBackButtonVisibleProperty, value); + } + + public bool IsBreadcrumbVisible + { + get => (bool)GetValue(IsBreadcrumbVisibleProperty); + set => SetValue(IsBreadcrumbVisibleProperty, value); } /// diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml index 18dd94206..7987ae074 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml @@ -42,13 +42,15 @@ + Navigation="{TemplateBinding Navigation}" + Visibility="Collapsed" /> + + + From 8f70c565a3930fe7e2a1e8a4ddab2b9802393d7d Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:40:18 +0600 Subject: [PATCH 4/5] added Content property and FramePadding property --- .../Views/Windows/TaskManagerWindow.xaml | 6 ++- src/Wpf.Ui/Controls/NavigationView.cs | 44 +++++++++++++++++-- .../Styles/Controls/NavigationView.xaml | 20 +++++---- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml index 92198ca90..53536d0a2 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml +++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml @@ -20,7 +20,11 @@ WindowStartupLocation="CenterScreen" mc:Ignorable="d"> - + /// Ready navigation that includes a control, and . /// -[TemplatePart(Name = "PART_Frame", Type = typeof(System.Windows.Controls.Frame))] +[TemplatePart(Name = "PART_BackButton", Type = typeof(NavigationBackButton))] +[TemplatePart(Name = "PART_Breadcrumb", Type = typeof(Breadcrumb))] +[TemplatePart(Name = "PART_Frame", Type = typeof(Frame))] public class NavigationView : System.Windows.Controls.Control { public static readonly DependencyProperty NavigationProperty = DependencyProperty.Register(nameof(Navigation), @@ -25,7 +29,11 @@ public class NavigationView : System.Windows.Controls.Control public static readonly DependencyProperty FrameMarginProperty = DependencyProperty.Register(nameof(FrameMargin), typeof(Thickness), typeof(NavigationView), - new PropertyMetadata(new Thickness(18, 0, 18, 0))); + new PropertyMetadata(new Thickness(0, 0, 0, 0))); + + public static readonly DependencyProperty FramePaddingProperty = DependencyProperty.Register(nameof(FramePadding), + typeof(Thickness), typeof(NavigationView), + new PropertyMetadata(new Thickness(0, 0, 0, 0))); public static readonly DependencyProperty IsBackButtonVisibleProperty = DependencyProperty.Register(nameof(IsBackButtonVisible), typeof(bool), typeof(NavigationView), @@ -35,6 +43,10 @@ public class NavigationView : System.Windows.Controls.Control typeof(bool), typeof(NavigationView), new PropertyMetadata(false)); + public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), + typeof(object), typeof(NavigationView), + new PropertyMetadata(null)); + public INavigation Navigation { get => (INavigation)GetValue(NavigationProperty); @@ -53,6 +65,12 @@ public Thickness FrameMargin set => SetValue(FrameMarginProperty, value); } + public Thickness FramePadding + { + get => (Thickness)GetValue(FramePaddingProperty); + set => SetValue(FramePaddingProperty, value); + } + public bool IsBackButtonVisible { get => (bool)GetValue(IsBackButtonVisibleProperty); @@ -65,15 +83,33 @@ public bool IsBreadcrumbVisible set => SetValue(IsBreadcrumbVisibleProperty, value); } + public object? Content + { + get => GetValue(ContentProperty); + set => SetValue(ContentProperty, value); + } + + /// + /// Back button + /// + public NavigationBackButton BackButton { get; private set; } = null!; + /// /// Navigation frame /// - public Frame Frame { get; protected set; } + public Frame Frame { get; protected set; } = null!; + + /// + /// Breadcrumb + /// + public Breadcrumb Breadcrumb { get; private set; } = null!; public override void OnApplyTemplate() { base.OnApplyTemplate(); - Frame = GetTemplateChild("PART_Frame") as Frame; + BackButton = (NavigationBackButton)GetTemplateChild("PART_BackButton")!; + Frame = (Frame)GetTemplateChild("PART_Frame")!; + Breadcrumb = (Breadcrumb)GetTemplateChild("PART_Breadcrumb")!; Navigation.Frame = Frame; } diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml index 7987ae074..06632cf95 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml @@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ @@ -41,8 +41,13 @@ + + - + @@ -64,10 +66,10 @@ - + - + From 6a5f76a08c1abe960031f01e9ab2bc628348a525 Mon Sep 17 00:00:00 2001 From: Ivan Dmitriev <42055372+IvanDmitriev1@users.noreply.github.com> Date: Fri, 5 Aug 2022 08:45:45 +0600 Subject: [PATCH 5/5] FrameMargin renamed to FrameBorderMargin --- src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml | 2 +- src/Wpf.Ui/Controls/NavigationView.cs | 8 ++++---- src/Wpf.Ui/Styles/Controls/NavigationView.xaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml index 53536d0a2..3e7b72c4d 100644 --- a/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml +++ b/src/Wpf.Ui.Demo/Views/Windows/TaskManagerWindow.xaml @@ -21,7 +21,7 @@ mc:Ignorable="d"> diff --git a/src/Wpf.Ui/Controls/NavigationView.cs b/src/Wpf.Ui/Controls/NavigationView.cs index 384ab9be0..3cc508e5b 100644 --- a/src/Wpf.Ui/Controls/NavigationView.cs +++ b/src/Wpf.Ui/Controls/NavigationView.cs @@ -27,7 +27,7 @@ public class NavigationView : System.Windows.Controls.Control typeof(Thickness), typeof(NavigationView), new PropertyMetadata(new Thickness(18, 18, 18, 18))); - public static readonly DependencyProperty FrameMarginProperty = DependencyProperty.Register(nameof(FrameMargin), + public static readonly DependencyProperty FrameBorderMarginProperty = DependencyProperty.Register(nameof(FrameBorderMargin), typeof(Thickness), typeof(NavigationView), new PropertyMetadata(new Thickness(0, 0, 0, 0))); @@ -59,10 +59,10 @@ public Thickness BreadcrumbMargin set => SetValue(BreadcrumbMarginProperty, value); } - public Thickness FrameMargin + public Thickness FrameBorderMargin { - get => (Thickness)GetValue(FrameMarginProperty); - set => SetValue(FrameMarginProperty, value); + get => (Thickness)GetValue(FrameBorderMarginProperty); + set => SetValue(FrameBorderMarginProperty, value); } public Thickness FramePadding diff --git a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml index 06632cf95..4fe225a48 100644 --- a/src/Wpf.Ui/Styles/Controls/NavigationView.xaml +++ b/src/Wpf.Ui/Styles/Controls/NavigationView.xaml @@ -32,7 +32,7 @@