Fix issue where some read-only DPs were read/write

Kinnara · May 13, 2020 · 2d06655 · 2d06655
1 parent c8e4f97
commit 2d06655
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/ModernWpf.Controls/NavigationView/NavigationView.cs b/ModernWpf.Controls/NavigationView/NavigationView.cs
@@ -1108,7 +1108,7 @@ void CreateAndHookEventsToSettings(string settingsName)
                 }
 
                 // hook up SettingsItem
-                SetValue(SettingsItemProperty, settingsItem);
+                SetValue(SettingsItemPropertyKey, settingsItem);
 
                 if (shouldSelectSetting)
                 {
@@ -4429,7 +4429,7 @@ void SyncSettingsSelectionState()
 
         void RaiseDisplayModeChanged(NavigationViewDisplayMode displayMode)
         {
-            SetValue(DisplayModeProperty, displayMode);
+            SetValue(DisplayModePropertyKey, displayMode);
             var eventArgs = new NavigationViewDisplayModeChangedEventArgs();
             eventArgs.DisplayMode = displayMode;
             DisplayModeChanged?.Invoke(this, eventArgs);

diff --git a/ModernWpf.Controls/NavigationView/NavigationView.properties.cs b/ModernWpf.Controls/NavigationView/NavigationView.properties.cs
@@ -149,17 +149,18 @@ private static void OnHeaderTemplatePropertyChanged(DependencyObject sender, Dep
 
         #region DisplayMode
 
-        public static readonly DependencyProperty DisplayModeProperty =
-            DependencyProperty.Register(
+        private static readonly DependencyPropertyKey DisplayModePropertyKey =
+            DependencyProperty.RegisterReadOnly(
                 nameof(DisplayMode),
                 typeof(NavigationViewDisplayMode),
                 typeof(NavigationView),
                 new PropertyMetadata(NavigationViewDisplayMode.Minimal, OnDisplayModePropertyChanged));
 
+        public static readonly DependencyProperty DisplayModeProperty = DisplayModePropertyKey.DependencyProperty;
+
         public NavigationViewDisplayMode DisplayMode
         {
             get => (NavigationViewDisplayMode)GetValue(DisplayModeProperty);
-            set => SetValue(DisplayModeProperty, value);
         }
 
         private static void OnDisplayModePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)
@@ -381,17 +382,18 @@ private static void OnMenuItemsSourcePropertyChanged(DependencyObject sender, De
 
         #region SettingsItem
 
-        public static readonly DependencyProperty SettingsItemProperty =
-            DependencyProperty.Register(
+        private static readonly DependencyPropertyKey SettingsItemPropertyKey =
+            DependencyProperty.RegisterReadOnly(
                 nameof(SettingsItem),
                 typeof(object),
                 typeof(NavigationView),
                 new PropertyMetadata(OnSettingsItemPropertyChanged));
 
+        public static readonly DependencyProperty SettingsItemProperty = SettingsItemPropertyKey.DependencyProperty;
+
         public object SettingsItem
         {
             get => GetValue(SettingsItemProperty);
-            set => SetValue(SettingsItemProperty, value);
         }
 
         private static void OnSettingsItemPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs args)