Make hide children setting take effect immediately

also correct accessibility levels in FilteredViewConverter and CodeViewConverter.
UnderminersTeam · Sep 21, 2024 · 1a72e8c · 1a72e8c
1 parent 7769b1d
commit 1a72e8c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
@@ -8,7 +8,7 @@ namespace UndertaleModTool
     [ValueConversion(typeof(object), typeof(ICollectionView))]
     public class CodeViewConverter : FilteredViewConverter
     {
-        public override Predicate<object> CreateFilter()
+        protected override Predicate<object> CreateFilter()
         {
             Predicate<object> baseFilter = base.CreateFilter();
             return (obj) =>

diff --git a/UndertaleModTool/Converters/FilteredViewConverter.cs b/UndertaleModTool/Converters/FilteredViewConverter.cs
@@ -26,7 +26,7 @@ public string Filter
             set { SetValue(FilterProperty, value); }
         }
 
-        public virtual Predicate<object> CreateFilter()
+        protected virtual Predicate<object> CreateFilter()
         {
             return (obj) =>
             {

diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -317,7 +317,7 @@ private void SetIDString(string str)
         [DllImport("user32.dll", SetLastError = true)]
         private static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
 
-        private void UpdateTree()
+        public void UpdateTree()
         {
             foreach (var child in (MainTree.Items[0] as TreeViewItem).Items)
                 ((child as TreeViewItem).ItemsSource as ICollectionView)?.Refresh();

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml.cs b/UndertaleModTool/Windows/SettingsWindow.xaml.cs
@@ -127,6 +127,9 @@ public static bool HideChildCodeEntries
             {
                 Settings.Instance.HideChildCodeEntries = value;
                 Settings.Save();
+
+                // Refresh the tree to make the changes take effect.
+                mainWindow.UpdateTree();
             }
         }