From 84bb78558ef8f56ccf0c54dec885ed3716ff32c6 Mon Sep 17 00:00:00 2001
From: Rusty Burchfield <GICodeWarrior@gmail.com>
Date: Sun, 12 Mar 2023 18:29:15 -0700
Subject: [PATCH 1/5] Sleep -> Yield

---
 FModel/ViewModels/CUE4ParseViewModel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index b566634a..42c4530f 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -509,7 +509,7 @@ public class CUE4ParseViewModel : ViewModel
     {
         foreach (var asset in assetItems)
         {
-            Thread.Sleep(10);
+            Thread.Yield();
             cancellationToken.ThrowIfCancellationRequested();
             Extract(cancellationToken, asset.FullPath, TabControl.HasNoTabs);
         }
@@ -519,7 +519,7 @@ public class CUE4ParseViewModel : ViewModel
     {
         foreach (var asset in folder.AssetsList.Assets)
         {
-            Thread.Sleep(10);
+            Thread.Yield();
             cancellationToken.ThrowIfCancellationRequested();
             try
             {

From d9e6c1f95137f5c5f8658b33206f43478e406b48 Mon Sep 17 00:00:00 2001
From: Rusty Burchfield <GICodeWarrior@gmail.com>
Date: Sun, 12 Mar 2023 18:30:06 -0700
Subject: [PATCH 2/5] Sleep -> Yield

---
 FModel/ViewModels/Commands/MenuCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FModel/ViewModels/Commands/MenuCommand.cs b/FModel/ViewModels/Commands/MenuCommand.cs
index 6d49bcb7..1fa133c5 100644
--- a/FModel/ViewModels/Commands/MenuCommand.cs
+++ b/FModel/ViewModels/Commands/MenuCommand.cs
@@ -106,7 +106,7 @@ public class MenuCommand : ViewModelCommand<ApplicationViewModel>
         if (parent.IsExpanded != isExpanded)
         {
             parent.IsExpanded = isExpanded;
-            Thread.Sleep(10);
+            Thread.Yield();
         }
 
         cancellationToken.ThrowIfCancellationRequested();

From b0db727426e4971421ce39e5846957e5ed4f7a75 Mon Sep 17 00:00:00 2001
From: Rusty Burchfield <GICodeWarrior@gmail.com>
Date: Thu, 16 Mar 2023 11:56:40 -0700
Subject: [PATCH 3/5] Enable TreeView UI Virtualization

---
 FModel/MainWindow.xaml                | 2 +-
 FModel/Views/Resources/Resources.xaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index f5d533a2..8db158ff 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -327,7 +327,7 @@
                                 </StackPanel>
                             </Grid>
                             <Separator Grid.Row="1" Style="{StaticResource CustomSeparator}" Margin="0" />
-                            <TreeView Grid.Row="2" x:Name="AssetsFolderName" Style="{StaticResource AssetsFolderTreeView}" PreviewMouseDoubleClick="OnAssetsTreeMouseDoubleClick">
+                            <TreeView Grid.Row="2" x:Name="AssetsFolderName" Style="{StaticResource AssetsFolderTreeView}" PreviewMouseDoubleClick="OnAssetsTreeMouseDoubleClick" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" ScrollViewer.CanContentScroll="True">
                                 <TreeView.ContextMenu>
                                     <ContextMenu>
                                         <MenuItem Header="Extract Folder's Packages" Click="OnFolderExtractClick">
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index 3d03acd8..7ccdc433 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -247,7 +247,7 @@
     </Style>
 
     <Style x:Key="AssetsFolderTreeView" TargetType="TreeView" BasedOn="{StaticResource {x:Type TreeView}}">
-        <Setter Property="ItemsSource" Value="{Binding CUE4Parse.AssetsFolder.FoldersView, IsAsync=True}" />
+        <Setter Property="ItemsSource" Value="{Binding CUE4Parse.AssetsFolder.FoldersView}" />
         <Setter Property="adonisExtensions:ScrollViewerExtension.VerticalScrollBarExpansionMode" Value="NeverExpand"/>
         <Setter Property="adonisExtensions:ScrollViewerExtension.VerticalScrollBarPlacement" Value="Docked"/>
         <Setter Property="adonisExtensions:ScrollViewerExtension.HorizontalScrollBarExpansionMode" Value="NeverExpand"/>
@@ -255,7 +255,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="ItemTemplate">
             <Setter.Value>
-                <HierarchicalDataTemplate ItemsSource="{Binding FoldersView, IsAsync=True}">
+                <HierarchicalDataTemplate ItemsSource="{Binding FoldersView}">
                     <StackPanel Orientation="Horizontal">
                         <Image x:Name="TreeImage" Source="/FModel;component/Resources/folder.png"
                                Width="16" Height="16" HorizontalAlignment="Center" Margin="0 0 3.5 0" />

From f9f3eb9f6ac227de7fbdddc78ba8465f64729514 Mon Sep 17 00:00:00 2001
From: Rusty Burchfield <GICodeWarrior@gmail.com>
Date: Thu, 16 Mar 2023 12:46:00 -0700
Subject: [PATCH 4/5] Optimize Expand/Collapse for quicker layout

---
 FModel/ViewModels/Commands/MenuCommand.cs | 54 ++++++++++++++++-------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/FModel/ViewModels/Commands/MenuCommand.cs b/FModel/ViewModels/Commands/MenuCommand.cs
index 1fa133c5..ca4e84e7 100644
--- a/FModel/ViewModels/Commands/MenuCommand.cs
+++ b/FModel/ViewModels/Commands/MenuCommand.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading;
 using AdonisUI.Controls;
 using FModel.Extensions;
@@ -79,19 +80,13 @@ public class MenuCommand : ViewModelCommand<ApplicationViewModel>
             case "ToolBox_Expand_All":
                 await ApplicationService.ThreadWorkerView.Begin(cancellationToken =>
                 {
-                    foreach (var folder in contextViewModel.CUE4Parse.AssetsFolder.Folders)
-                    {
-                        LoopFolders(cancellationToken, folder, true);
-                    }
+                    SetFoldersIsExpanded(contextViewModel.CUE4Parse.AssetsFolder, true, cancellationToken);
                 });
                 break;
             case "ToolBox_Collapse_All":
                 await ApplicationService.ThreadWorkerView.Begin(cancellationToken =>
                 {
-                    foreach (var folder in contextViewModel.CUE4Parse.AssetsFolder.Folders)
-                    {
-                        LoopFolders(cancellationToken, folder, false);
-                    }
+                    SetFoldersIsExpanded(contextViewModel.CUE4Parse.AssetsFolder, false, cancellationToken);
                 });
                 break;
             case TreeItem selectedFolder:
@@ -101,15 +96,44 @@ public class MenuCommand : ViewModelCommand<ApplicationViewModel>
         }
     }
 
-    private void LoopFolders(CancellationToken cancellationToken, TreeItem parent, bool isExpanded)
+    private static void SetFoldersIsExpanded(AssetsFolderViewModel root, bool isExpanded, CancellationToken cancellationToken)
     {
-        if (parent.IsExpanded != isExpanded)
+        LinkedList<TreeItem> nodes = new();
+        foreach (TreeItem folder in root.Folders)
         {
-            parent.IsExpanded = isExpanded;
-            Thread.Yield();
+            nodes.AddLast(folder);
         }
 
-        cancellationToken.ThrowIfCancellationRequested();
-        foreach (var f in parent.Folders) LoopFolders(cancellationToken, f, isExpanded);
+        LinkedListNode<TreeItem> current = nodes.First;
+        while (current != null)
+        {
+            TreeItem folder = current.Value;
+
+            // Collapse top-down (reduce layout updates)
+            if (!isExpanded)
+            {
+                folder.IsExpanded = isExpanded;
+                Thread.Yield();
+                cancellationToken.ThrowIfCancellationRequested();
+            }
+
+            foreach (TreeItem child in folder.Folders)
+            {
+                nodes.AddLast(child);
+            }
+
+            current = current.Next;
+        }
+
+        // Expand bottom-up (reduce layout updates)
+        if (isExpanded)
+        {
+            for (LinkedListNode<TreeItem> node = nodes.Last; node != null; node = node.Previous)
+            {
+                node.Value.IsExpanded = isExpanded;
+                Thread.Yield();
+                cancellationToken.ThrowIfCancellationRequested();
+            }
+        }
     }
 }

From 3e20a32bce398f84d82da5afa879324068c44b25 Mon Sep 17 00:00:00 2001
From: Rusty Burchfield <GICodeWarrior@gmail.com>
Date: Thu, 16 Mar 2023 13:06:26 -0700
Subject: [PATCH 5/5] Fix Visual Studio complaints about Nested Types

https://developercommunity.visualstudio.com/t/xaml-nested-types-are-not-supported/516142
---
 FModel/MainWindow.xaml                | 16 +++++++++-------
 FModel/Views/Resources/Resources.xaml | 13 +++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 8db158ff..ff782d64 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -4,6 +4,8 @@
         xmlns:local="clr-namespace:FModel"
         xmlns:controls="clr-namespace:FModel.Views.Resources.Controls"
         xmlns:converters="clr-namespace:FModel.Views.Resources.Converters"
+        xmlns:settings="clr-namespace:FModel.Settings"
+        xmlns:services="clr-namespace:FModel.Services"
         xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"
         xmlns:adonisControls="clr-namespace:AdonisUI.Controls;assembly=AdonisUI"
         xmlns:adonisExtensions="clr-namespace:AdonisUI.Extensions;assembly=AdonisUI"
@@ -95,7 +97,7 @@
                 </MenuItem>
                 <Separator />
                 <MenuItem Header="Auto Open Sounds" IsCheckable="True" StaysOpenOnClick="True"
-                          IsChecked="{Binding IsAutoOpenSounds, Source={x:Static local:Settings.UserSettings.Default}}" />
+                          IsChecked="{Binding IsAutoOpenSounds, Source={x:Static settings:UserSettings.Default}}" />
             </MenuItem>
             <MenuItem Header="Views">
                 <MenuItem Header="3D Viewer" Command="{Binding MenuCommand}" CommandParameter="Views_3dViewer">
@@ -221,7 +223,7 @@
 
                                 <TextBlock Grid.Row="0" Grid.Column="0" Text="Loading Mode" VerticalAlignment="Center" />
                                 <ComboBox Grid.Row="0" Grid.Column="2" ItemsSource="{Binding LoadingModes.Modes}" IsEnabled="{Binding Status.IsReady}"
-                                          SelectedItem="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}">
+                                          SelectedItem="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}, Mode=TwoWay}">
                                     <ComboBox.ItemTemplate>
                                         <DataTemplate>
                                             <TextBlock Text="{Binding Converter={x:Static converters:EnumToStringConverter.Instance}}" />
@@ -671,7 +673,7 @@
 
                     <TabControl Grid.Row="0" x:Name="TabControlName" Style="{StaticResource GameFilesTabControl}" />
                     <Expander Grid.Row="1" Margin="0 5 0 5" ExpandDirection="Down"
-                              IsExpanded="{Binding IsLoggerExpanded, Source={x:Static local:Settings.UserSettings.Default}}">
+                              IsExpanded="{Binding IsLoggerExpanded, Source={x:Static settings:UserSettings.Default}}">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -734,7 +736,7 @@
                             <Setter Property="Background" Value="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" />
                             <Setter Property="Foreground" Value="White" />
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding StatusChangeAttempted, Source={x:Static local:Services.ApplicationService.ThreadWorkerView}}" Value="True">
+                        <DataTrigger Binding="{Binding StatusChangeAttempted, Source={x:Static services:ApplicationService.ThreadWorkerView}}" Value="True">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard Duration="0:0:0.8">
@@ -751,7 +753,7 @@
                                 </BeginStoryboard>
                             </DataTrigger.EnterActions>
                         </DataTrigger>
-                        <DataTrigger Binding="{Binding OperationCancelled, Source={x:Static local:Services.ApplicationService.ThreadWorkerView}}" Value="True">
+                        <DataTrigger Binding="{Binding OperationCancelled, Source={x:Static services:ApplicationService.ThreadWorkerView}}" Value="True">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard Duration="0:0:1">
@@ -780,7 +782,7 @@
                                 </DataTrigger>
                                 <MultiDataTrigger>
                                     <MultiDataTrigger.Conditions>
-                                        <Condition Binding="{Binding CanBeCanceled, Source={x:Static local:Services.ApplicationService.ThreadWorkerView}}" Value="True" />
+                                        <Condition Binding="{Binding CanBeCanceled, Source={x:Static services:ApplicationService.ThreadWorkerView}}" Value="True" />
                                         <Condition Binding="{Binding Status.Kind}" Value="{x:Static local:EStatusKind.Loading}" />
                                     </MultiDataTrigger.Conditions>
                                     <Setter Property="Text" Value="{Binding Status.Label, StringFormat='{}{0} …    ESC to Cancel'}" />
@@ -805,7 +807,7 @@
                         <StatusBarItem.Style>
                             <Style TargetType="StatusBarItem">
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsAutoOpenSounds, Source={x:Static local:Settings.UserSettings.Default}}" Value="False">
+                                    <DataTrigger Binding="{Binding IsAutoOpenSounds, Source={x:Static settings:UserSettings.Default}}" Value="False">
                                         <Setter Property="Visibility" Value="Hidden" />
                                     </DataTrigger>
                                 </Style.Triggers>
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index 7ccdc433..e6c3373b 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -6,6 +6,7 @@
                     xmlns:soundOut="clr-namespace:CSCore.SoundOut;assembly=CSCore"
                     xmlns:audioControls="clr-namespace:FModel.Views.Resources.Controls.Aup"
                     xmlns:converters="clr-namespace:FModel.Views.Resources.Converters"
+                    xmlns:settings="clr-namespace:FModel.Settings"
                     xmlns:avalonedit="http://icsharpcode.net/sharpdevelop/avalonedit"
                     xmlns:folding="clr-namespace:ICSharpCode.AvalonEdit.Folding;assembly=ICSharpCode.AvalonEdit"
                     xmlns:adonisUi="clr-namespace:AdonisUI;assembly=AdonisUI"
@@ -182,19 +183,19 @@
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Single}">
+            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Single}">
                 <Setter Property="SelectionMode" Value="Single" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Multiple}">
+            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Multiple}">
                 <Setter Property="SelectionMode" Value="Extended" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}}" Value="{x:Static local:ELoadingMode.All}">
+            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.All}">
                 <Setter Property="SelectionMode" Value="Extended" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}}" Value="{x:Static local:ELoadingMode.AllButNew}">
+            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.AllButNew}">
                 <Setter Property="SelectionMode" Value="Extended" />
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static local:Settings.UserSettings.Default}}" Value="{x:Static local:ELoadingMode.AllButModified}">
+            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.AllButModified}">
                 <Setter Property="SelectionMode" Value="Extended" />
             </DataTrigger>
         </Style.Triggers>
@@ -647,7 +648,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="{Binding AvalonImageSize, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
+                            <ColumnDefinition Width="{Binding AvalonImageSize, Source={x:Static settings:UserSettings.Default}, Mode=TwoWay}" />
                         </Grid.ColumnDefinitions>
 
                         <controls:AvalonEditor x:Name="DynamicArea" Grid.Column="0" DataContext="{Binding SelectedItem, ElementName=TabControlName}" />