From 527fce72c47d19021c2232da61138fea334131b6 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Fri, 20 Sep 2024 22:13:24 +0300
Subject: [PATCH 1/9] Implement CodeViewConverter

which filters child code entries from the code list
on top of the normal filtering done by FilteringViewConverter.
---
 .../Converters/CodeViewConverter.cs           | 22 +++++++++++++++++++
 .../Converters/FilteredViewConverter.cs       | 15 ++++++++-----
 UndertaleModTool/MainWindow.xaml              |  3 ++-
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 UndertaleModTool/Converters/CodeViewConverter.cs

diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
new file mode 100644
index 000000000..2920c471f
--- /dev/null
+++ b/UndertaleModTool/Converters/CodeViewConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Data;
+using UndertaleModLib.Models;
+
+namespace UndertaleModTool
+{
+    [ValueConversion(typeof(object), typeof(ICollectionView))]
+    public class CodeViewConverter : FilteredViewConverter
+    {
+        public override Predicate<object> CreateFilter()
+        {
+            Predicate<object> baseFilter = base.CreateFilter();
+            return (obj) =>
+            {
+                if (obj is UndertaleCode code && code.ParentEntry != null)
+                    return false;
+                return baseFilter(obj);
+            };
+        }
+    }
+}
diff --git a/UndertaleModTool/Converters/FilteredViewConverter.cs b/UndertaleModTool/Converters/FilteredViewConverter.cs
index fa6bed3b0..b38f3b25b 100644
--- a/UndertaleModTool/Converters/FilteredViewConverter.cs
+++ b/UndertaleModTool/Converters/FilteredViewConverter.cs
@@ -26,12 +26,9 @@ public string Filter
             set { SetValue(FilterProperty, value); }
         }
 
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public virtual Predicate<object> CreateFilter()
         {
-            if (value == null)
-                return null;
-            ICollectionView filteredView = CollectionViewSource.GetDefaultView(value);
-            filteredView.Filter = (obj) =>
+            return (obj) =>
             {
                 if (String.IsNullOrEmpty(Filter))
                     return true;
@@ -44,6 +41,14 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
                                 .Any(x => (x?.IndexOf(Filter, StringComparison.OrdinalIgnoreCase) ?? -1) >= 0);
                 return true;
             };
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+                return null;
+            ICollectionView filteredView = CollectionViewSource.GetDefaultView(value);
+            filteredView.Filter = CreateFilter();
             return filteredView;
         }
 
diff --git a/UndertaleModTool/MainWindow.xaml b/UndertaleModTool/MainWindow.xaml
index 2ff7ef5d6..3ecf42f55 100644
--- a/UndertaleModTool/MainWindow.xaml
+++ b/UndertaleModTool/MainWindow.xaml
@@ -23,6 +23,7 @@
     <Window.Resources>
         <local:ImplementsInterfaceConverter x:Key="ImplementsInterfaceConverter"/>
         <local:FilteredViewConverter x:Key="FilteredViewConverter" Filter="{Binding Text, Source={x:Reference SearchBox}, UpdateSourceTrigger=PropertyChanged}"/>
+        <local:CodeViewConverter x:Key="CodeViewConverter" Filter="{Binding Text, Source={x:Reference SearchBox}, UpdateSourceTrigger=PropertyChanged}"/>
         <local:NullToVisibilityConverter x:Key="VisibleIfNotNull"  nullValue="Collapsed" notNullValue="Visible"/>
         <local:CompareNumbersConverter x:Key="CompareNumbersConverter"/>
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter"/> <!-- (built-in converter) -->
@@ -388,7 +389,7 @@
                                 </HierarchicalDataTemplate>
                             </TreeViewItem.ItemTemplate>
                         </TreeViewItem>
-                        <TreeViewItem Name="CodeItemsList" Header="Code" ItemsSource="{Binding Code, Converter={StaticResource FilteredViewConverter}}" Visibility="{Binding Code, Converter={StaticResource VisibleIfNotNull}}">
+                        <TreeViewItem Name="CodeItemsList" Header="Code" ItemsSource="{Binding Code, Converter={StaticResource CodeViewConverter}}" Visibility="{Binding Code, Converter={StaticResource VisibleIfNotNull}}">
                             <TreeViewItem.ItemContainerStyle>
                                 <Style TargetType="{x:Type TreeViewItem}">
                                     <Setter Property="ContextMenu" Value="{StaticResource UndertaleResourceMenu}"/>

From 7769b1d832d12bea6a5e4d7687cb74b54f9ead5f Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Fri, 20 Sep 2024 22:59:32 +0300
Subject: [PATCH 2/9] Add setting for hiding child code entries

The setting has no tooltip as of yet.
---
 .../Converters/CodeViewConverter.cs           |  4 +-
 UndertaleModTool/Settings.cs                  |  1 +
 UndertaleModTool/Windows/SettingsWindow.xaml  | 52 ++++++++++---------
 .../Windows/SettingsWindow.xaml.cs            |  9 ++++
 4 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
index 2920c471f..fe02238ec 100644
--- a/UndertaleModTool/Converters/CodeViewConverter.cs
+++ b/UndertaleModTool/Converters/CodeViewConverter.cs
@@ -13,7 +13,9 @@ public override Predicate<object> CreateFilter()
             Predicate<object> baseFilter = base.CreateFilter();
             return (obj) =>
             {
-                if (obj is UndertaleCode code && code.ParentEntry != null)
+                if (obj is UndertaleCode code &&
+                    code.ParentEntry != null &&
+                    Settings.Instance.HideChildCodeEntries)
                     return false;
                 return baseFilter(obj);
             };
diff --git a/UndertaleModTool/Settings.cs b/UndertaleModTool/Settings.cs
index b20c8d1a9..86917a947 100644
--- a/UndertaleModTool/Settings.cs
+++ b/UndertaleModTool/Settings.cs
@@ -40,6 +40,7 @@ public class Settings
 
         public bool DeleteOldProfileOnSave { get; set; } = false;
         public bool WarnOnClose { get; set; } = true;
+        public bool HideChildCodeEntries { get; set; } = false;
 
         private double _globalGridWidth = 20;
         private double _globalGridHeight = 20;
diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
index 76b2e7c5d..8f6641e45 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -37,6 +37,7 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
             <TextBlock Grid.Row="1" Grid.Column="0" Margin="3" Text="Game Maker: Studio 1.4 path" ToolTip="Required only if you want to use the Studio runner rather than the .exe or run the game under debugger."/>
@@ -60,41 +61,44 @@
             <CheckBox Grid.Row="5" Grid.Column="2" Margin="3" Content="" IsChecked="{Binding ShowDebuggerOption}"/>
             <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Show &quot;Run game under GMS debugger&quot; file option" ToolTip="Whether to show the option in the &quot;File&quot; menu. Disabled by default."/>
 
-            <Separator Grid.Row="6" Grid.ColumnSpan="4" Margin="10"/>
+            <CheckBox Grid.Row="6" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding HideChildCodeEntries}"/>
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="tooltip TBA"/>
+
+            <Separator Grid.Row="7" Grid.ColumnSpan="4" Margin="10"/>
 
-            <CheckBox Grid.Row="7" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding EnableDarkMode}"/>
-            <TextBlock Grid.Row="7" Grid.Column="0" Margin="25 2 2 2" Text="Enable dark mode" ToolTip="Makes the program interface dark. Disabled by default."/>
+            <CheckBox Grid.Row="8" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding EnableDarkMode}"/>
+            <TextBlock Grid.Row="8" Grid.Column="0" Margin="25 2 2 2" Text="Enable dark mode" ToolTip="Makes the program interface dark. Disabled by default."/>
 
-            <Separator Grid.Row="8" Grid.ColumnSpan="4" Margin="10"/>
+            <Separator Grid.Row="9" Grid.ColumnSpan="4" Margin="10"/>
 
-            <CheckBox Grid.Row="9" Grid.Column="0" Margin="3" VerticalAlignment="Center" Name="gridWidthCheckbox" Content="" IsChecked="{Binding GridWidthEnabled}"/>
-            <TextBlock Grid.Row="9" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Global grid width" ToolTip="This option globally overrides the automatic assignment of a room's grid width based on the most used tile's width in that room."/>
-            <local:TextBoxDark Grid.Row="9" Grid.Column="1" Margin="3" IsEnabled="{Binding ElementName=gridWidthCheckbox, Path=IsChecked}" Text="{Binding GlobalGridWidth}"/>
+            <CheckBox Grid.Row="10" Grid.Column="0" Margin="3" VerticalAlignment="Center" Name="gridWidthCheckbox" Content="" IsChecked="{Binding GridWidthEnabled}"/>
+            <TextBlock Grid.Row="10" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Global grid width" ToolTip="This option globally overrides the automatic assignment of a room's grid width based on the most used tile's width in that room."/>
+            <local:TextBoxDark Grid.Row="10" Grid.Column="1" Margin="3" IsEnabled="{Binding ElementName=gridWidthCheckbox, Path=IsChecked}" Text="{Binding GlobalGridWidth}"/>
 
-            <CheckBox Grid.Row="10" Grid.Column="0" Margin="3" VerticalAlignment="Center" Name="gridHeightCheckbox" Content="" IsChecked="{Binding GridHeightEnabled}"/>
-            <TextBlock Grid.Row="10" Grid.Column="0" Margin="25 2 2 2"  VerticalAlignment="Center" Text="Global grid height" ToolTip="This option globally overrides the automatic assignment of a room's grid height based on the most used tile's height in that room."/>
-            <local:TextBoxDark Grid.Row="10" Grid.Column="1" Margin="3" IsEnabled="{Binding ElementName=gridHeightCheckbox, Path=IsChecked}" Text="{Binding GlobalGridHeight}"/>
+            <CheckBox Grid.Row="11" Grid.Column="0" Margin="3" VerticalAlignment="Center" Name="gridHeightCheckbox" Content="" IsChecked="{Binding GridHeightEnabled}"/>
+            <TextBlock Grid.Row="11" Grid.Column="0" Margin="25 2 2 2"  VerticalAlignment="Center" Text="Global grid height" ToolTip="This option globally overrides the automatic assignment of a room's grid height based on the most used tile's height in that room."/>
+            <local:TextBoxDark Grid.Row="11" Grid.Column="1" Margin="3" IsEnabled="{Binding ElementName=gridHeightCheckbox, Path=IsChecked}" Text="{Binding GlobalGridHeight}"/>
 
-            <CheckBox Grid.Row="9" Grid.Column="2" Margin="3" VerticalAlignment="Center" Name="gridThicknessCheckBox" Content="" IsChecked="{Binding GridThicknessEnabled}"/>
-            <TextBlock Grid.Row="9" Grid.Column="2" Margin="25 2 2 2" VerticalAlignment="Center" Text="Global grid thickness" ToolTip="This option globally overrides the automatic assignment of a room's grid thickness."/>
-            <local:TextBoxDark Grid.Row="9" Grid.Column="3" Margin="3" IsEnabled="{Binding ElementName=gridThicknessCheckBox, Path=IsChecked}" Text="{Binding GlobalGridThickness}"/>
+            <CheckBox Grid.Row="10" Grid.Column="2" Margin="3" VerticalAlignment="Center" Name="gridThicknessCheckBox" Content="" IsChecked="{Binding GridThicknessEnabled}"/>
+            <TextBlock Grid.Row="10" Grid.Column="2" Margin="25 2 2 2" VerticalAlignment="Center" Text="Global grid thickness" ToolTip="This option globally overrides the automatic assignment of a room's grid thickness."/>
+            <local:TextBoxDark Grid.Row="10" Grid.Column="3" Margin="3" IsEnabled="{Binding ElementName=gridThicknessCheckBox, Path=IsChecked}" Text="{Binding GlobalGridThickness}"/>
 
-            <Separator Grid.Row="13" Grid.ColumnSpan="4" Margin="10"/>
+            <Separator Grid.Row="14" Grid.ColumnSpan="4" Margin="10"/>
 
-            <TextBlock Grid.Row="14" Grid.Column="0" Grid.ColumnSpan="4" Margin="3" TextWrapping="Wrap" Foreground="Red" FontWeight="Bold" Text="Warning: the following options are currently experimental, as the profile system is a work in progress. Usage of the system is at your own risk, and though it is relatively stable, it may not be compatible in the future."/>
+            <TextBlock Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="4" Margin="3" TextWrapping="Wrap" Foreground="Red" FontWeight="Bold" Text="Warning: the following options are currently experimental, as the profile system is a work in progress. Usage of the system is at your own risk, and though it is relatively stable, it may not be compatible in the future."/>
 
-            <CheckBox Grid.Row="15" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding ProfileModeEnabled}"/>
-            <TextBlock Grid.Row="15" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Enable profile mode" ToolTip="Toggles the 'decompile once and compile many' profile mode. Enabled by default. May need to be disabled for certain operations."/>
+            <CheckBox Grid.Row="16" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding ProfileModeEnabled}"/>
+            <TextBlock Grid.Row="16" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Enable profile mode" ToolTip="Toggles the 'decompile once and compile many' profile mode. Enabled by default. May need to be disabled for certain operations."/>
 
-            <CheckBox Grid.Row="15" Grid.Column="2" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding ProfileMessageShown}"/>
-            <TextBlock Grid.Row="15" Grid.Column="2" Margin="25 2 2 2" VerticalAlignment="Center" Text="Profile mode message shown" ToolTip="On first load, this will show you the profile mode loaded message. If this somehow breaks, you can manually toggle it here."/>
+            <CheckBox Grid.Row="16" Grid.Column="2" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding ProfileMessageShown}"/>
+            <TextBlock Grid.Row="16" Grid.Column="2" Margin="25 2 2 2" VerticalAlignment="Center" Text="Profile mode message shown" ToolTip="On first load, this will show you the profile mode loaded message. If this somehow breaks, you can manually toggle it here."/>
 
-            <CheckBox Grid.Row="17" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding DeleteOldProfileOnSave}"/>
-            <TextBlock Grid.Row="17" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Delete old profile on saving" ToolTip="Deletes the profile obsoleted on saving. Saves on file space at the expense of losing code information for variants. Enabled by default."/>
+            <CheckBox Grid.Row="18" Grid.Column="0" Margin="3" VerticalAlignment="Center" Content="" IsChecked="{Binding DeleteOldProfileOnSave}"/>
+            <TextBlock Grid.Row="18" Grid.Column="0" Margin="25 2 2 2" VerticalAlignment="Center" Text="Delete old profile on saving" ToolTip="Deletes the profile obsoleted on saving. Saves on file space at the expense of losing code information for variants. Enabled by default."/>
 
-            <Separator Grid.Row="18" Grid.ColumnSpan="4" Margin="10"/>
-            <local:ButtonDark Grid.Row="19" Grid.Column="0" Grid.ColumnSpan="1" Margin="5" Click="AppDataButton_Click">Open application data folder</local:ButtonDark>
-            <local:ButtonDark Grid.Row="19" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Click="UpdateAppButton_Click" x:Name="UpdateAppButton" HorizontalAlignment="Right" Width="223" Visibility="{Binding UpdaterButtonVisibility}">Update app to latest commit</local:ButtonDark>
+            <Separator Grid.Row="19" Grid.ColumnSpan="4" Margin="10"/>
+            <local:ButtonDark Grid.Row="20" Grid.Column="0" Grid.ColumnSpan="1" Margin="5" Click="AppDataButton_Click">Open application data folder</local:ButtonDark>
+            <local:ButtonDark Grid.Row="20" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Click="UpdateAppButton_Click" x:Name="UpdateAppButton" HorizontalAlignment="Right" Width="223" Visibility="{Binding UpdaterButtonVisibility}">Update app to latest commit</local:ButtonDark>
         </Grid>
     </ScrollViewer>
 </Window>
diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml.cs b/UndertaleModTool/Windows/SettingsWindow.xaml.cs
index dd4cb7c1b..a9846ebf1 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml.cs
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml.cs
@@ -120,6 +120,15 @@ public static bool WarnOnClose
                 Settings.Save();
             }
         }
+        public static bool HideChildCodeEntries
+        {
+            get => Settings.Instance.HideChildCodeEntries;
+            set
+            {
+                Settings.Instance.HideChildCodeEntries = value;
+                Settings.Save();
+            }
+        }
 
         public static double GlobalGridWidth
         {

From 1a72e8cf5e4b6bfde5e1091cea5cf985487dd91f Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Sat, 21 Sep 2024 16:08:51 +0300
Subject: [PATCH 3/9] Make hide children setting take effect immediately

also correct accessibility levels in FilteredViewConverter and CodeViewConverter.
---
 UndertaleModTool/Converters/CodeViewConverter.cs     | 2 +-
 UndertaleModTool/Converters/FilteredViewConverter.cs | 2 +-
 UndertaleModTool/MainWindow.xaml.cs                  | 2 +-
 UndertaleModTool/Windows/SettingsWindow.xaml.cs      | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
index fe02238ec..04e77b669 100644
--- 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
index b38f3b25b..73320d566 100644
--- 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
index b0751c93a..150ace9ef 100644
--- 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
index a9846ebf1..9691f3c08 100644
--- 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();
             }
         }
 

From f46f027ab8768025f248083072166934f0af1ad1 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Sat, 21 Sep 2024 17:04:41 +0300
Subject: [PATCH 4/9] Hide children setting refinement

- Add setting tooltip.
- Make the setting on by default.
---
 UndertaleModTool/Settings.cs                 | 2 +-
 UndertaleModTool/Windows/SettingsWindow.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UndertaleModTool/Settings.cs b/UndertaleModTool/Settings.cs
index 86917a947..471f3b088 100644
--- a/UndertaleModTool/Settings.cs
+++ b/UndertaleModTool/Settings.cs
@@ -40,7 +40,7 @@ public class Settings
 
         public bool DeleteOldProfileOnSave { get; set; } = false;
         public bool WarnOnClose { get; set; } = true;
-        public bool HideChildCodeEntries { get; set; } = false;
+        public bool HideChildCodeEntries { get; set; } = true;
 
         private double _globalGridWidth = 20;
         private double _globalGridHeight = 20;
diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
index 8f6641e45..0ba037ef7 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -62,7 +62,7 @@
             <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Show &quot;Run game under GMS debugger&quot; file option" ToolTip="Whether to show the option in the &quot;File&quot; menu. Disabled by default."/>
 
             <CheckBox Grid.Row="6" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding HideChildCodeEntries}"/>
-            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="tooltip TBA"/>
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries in GMS2.3 games, which correspond to sub-functions of scripts."/>
 
             <Separator Grid.Row="7" Grid.ColumnSpan="4" Margin="10"/>
 

From 24245ac56f50e3165536d59bf862b5cdcfa067dd Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Sat, 21 Sep 2024 17:15:17 +0300
Subject: [PATCH 5/9] fix grammar

---
 UndertaleModTool/Windows/SettingsWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
index 0ba037ef7..c8331ddac 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -62,7 +62,7 @@
             <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Show &quot;Run game under GMS debugger&quot; file option" ToolTip="Whether to show the option in the &quot;File&quot; menu. Disabled by default."/>
 
             <CheckBox Grid.Row="6" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding HideChildCodeEntries}"/>
-            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries in GMS2.3 games, which correspond to sub-functions of scripts."/>
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries corresponding to sub-functions of scripts in GMS2.3 games"/>
 
             <Separator Grid.Row="7" Grid.ColumnSpan="4" Margin="10"/>
 

From abcad714faedcc85f5898ae32a8633f901a88287 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor06@gmail.com>
Date: Sat, 21 Sep 2024 17:24:25 +0300
Subject: [PATCH 6/9] grammmar fix 2

---
 UndertaleModTool/Windows/SettingsWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
index c8331ddac..43c7bb704 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -62,7 +62,7 @@
             <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Show &quot;Run game under GMS debugger&quot; file option" ToolTip="Whether to show the option in the &quot;File&quot; menu. Disabled by default."/>
 
             <CheckBox Grid.Row="6" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding HideChildCodeEntries}"/>
-            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries corresponding to sub-functions of scripts in GMS2.3 games"/>
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries corresponding to sub-functions of scripts in GMS2.3 games."/>
 
             <Separator Grid.Row="7" Grid.ColumnSpan="4" Margin="10"/>
 

From 8e3a187e1ac854c734b5db2307e4d9c9f6183815 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor.06@gmail.com>
Date: Mon, 25 Nov 2024 18:35:08 +0200
Subject: [PATCH 7/9] Minor code improvement

---
 UndertaleModTool/Converters/CodeViewConverter.cs     | 2 +-
 UndertaleModTool/Converters/FilteredViewConverter.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
index 04e77b669..80c722031 100644
--- a/UndertaleModTool/Converters/CodeViewConverter.cs
+++ b/UndertaleModTool/Converters/CodeViewConverter.cs
@@ -14,7 +14,7 @@ protected override Predicate<object> CreateFilter()
             return (obj) =>
             {
                 if (obj is UndertaleCode code &&
-                    code.ParentEntry != null &&
+                    code.ParentEntry is not null &&
                     Settings.Instance.HideChildCodeEntries)
                     return false;
                 return baseFilter(obj);
diff --git a/UndertaleModTool/Converters/FilteredViewConverter.cs b/UndertaleModTool/Converters/FilteredViewConverter.cs
index 73320d566..465217f14 100644
--- a/UndertaleModTool/Converters/FilteredViewConverter.cs
+++ b/UndertaleModTool/Converters/FilteredViewConverter.cs
@@ -45,7 +45,7 @@ protected virtual Predicate<object> CreateFilter()
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null)
+            if (value is null)
                 return null;
             ICollectionView filteredView = CollectionViewSource.GetDefaultView(value);
             filteredView.Filter = CreateFilter();

From cd4d5ceae6f2c7032e979df421fed2debbc25163 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor.06@gmail.com>
Date: Wed, 27 Nov 2024 15:08:11 +0200
Subject: [PATCH 8/9] Changes code accessing hide children setting

Changes the code to use SettingsWindow instead of Settings.Instance
to better fit with similar code for other settings.

Note: this should probably be standardized across all settings.
---
 UndertaleModTool/Converters/CodeViewConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UndertaleModTool/Converters/CodeViewConverter.cs b/UndertaleModTool/Converters/CodeViewConverter.cs
index 80c722031..359453e69 100644
--- a/UndertaleModTool/Converters/CodeViewConverter.cs
+++ b/UndertaleModTool/Converters/CodeViewConverter.cs
@@ -15,7 +15,7 @@ protected override Predicate<object> CreateFilter()
             {
                 if (obj is UndertaleCode code &&
                     code.ParentEntry is not null &&
-                    Settings.Instance.HideChildCodeEntries)
+                    SettingsWindow.HideChildCodeEntries)
                     return false;
                 return baseFilter(obj);
             };

From b7afc0b540d8e8a17cbef2a40deba1313c651aa8 Mon Sep 17 00:00:00 2001
From: zivmaor <ziv.maor.06@gmail.com>
Date: Wed, 27 Nov 2024 15:22:16 +0200
Subject: [PATCH 9/9] Improves hide children setting tooltip

---
 UndertaleModTool/Windows/SettingsWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UndertaleModTool/Windows/SettingsWindow.xaml b/UndertaleModTool/Windows/SettingsWindow.xaml
index 43c7bb704..605995bfe 100644
--- a/UndertaleModTool/Windows/SettingsWindow.xaml
+++ b/UndertaleModTool/Windows/SettingsWindow.xaml
@@ -62,7 +62,7 @@
             <TextBlock Grid.Row="5" Grid.Column="2" Margin="25 2 2 2" Text="Show &quot;Run game under GMS debugger&quot; file option" ToolTip="Whether to show the option in the &quot;File&quot; menu. Disabled by default."/>
 
             <CheckBox Grid.Row="6" Grid.Column="0" Margin="3" Content="" IsChecked="{Binding HideChildCodeEntries}"/>
-            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries corresponding to sub-functions of scripts in GMS2.3 games."/>
+            <TextBlock Grid.Row="6" Grid.Column="0" Margin="25 2 2 2" Text="Hide child code entries" ToolTip="Hides code entries corresponding to sub-functions of scripts in the asset list. Only relevent for GMS2.3+ games. Enabled by default."/>
 
             <Separator Grid.Row="7" Grid.ColumnSpan="4" Margin="10"/>