From 22d77f03ff72dca09d12f741f59a548b5e59c5ba Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Tue, 12 Mar 2024 20:57:23 -0400
Subject: [PATCH 01/10] Initial Implementation

---
 .../App/ApplicationLibrary.cs                 |  49 +++++++++++++++++-
 .../Resources/Icon_Folder.png                 | Bin 0 -> 2091 bytes
 .../Ryujinx.UI.Common.csproj                  |   2 +
 src/Ryujinx/UI/Helpers/Glyph.cs               |   1 +
 src/Ryujinx/UI/Helpers/GlyphValueConverter.cs |   1 +
 .../UI/ViewModels/MainWindowViewModel.cs      |  30 +++++++++++
 .../UI/Views/Main/MainViewControls.axaml      |  13 +++++
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    |   5 ++
 8 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 src/Ryujinx.UI.Common/Resources/Icon_Folder.png

diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index 65cf7a9e6d..ccd7070585 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -41,6 +41,7 @@ namespace Ryujinx.UI.App.Common
         private readonly byte[] _ncaIcon;
         private readonly byte[] _nroIcon;
         private readonly byte[] _nsoIcon;
+        private readonly byte[] _folderIcon;
 
         private readonly VirtualFileSystem _virtualFileSystem;
         private Language _desiredTitleLanguage;
@@ -58,6 +59,7 @@ namespace Ryujinx.UI.App.Common
             _ncaIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NCA.png");
             _nroIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NRO.png");
             _nsoIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NSO.png");
+            _folderIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_Folder.png");
         }
 
         private static byte[] GetResourceBytes(string resourceName)
@@ -113,7 +115,31 @@ namespace Ryujinx.UI.App.Common
 
                     try
                     {
-                        IEnumerable<string> files = Directory.EnumerateFiles(appDir, "*", SearchOption.AllDirectories).Where(file =>
+                        IEnumerable<string> folders = Directory.EnumerateDirectories(appDir, "*", SearchOption.TopDirectoryOnly);
+                        foreach (string folder in folders)
+                        {
+                            if (_cancellationToken.Token.IsCancellationRequested)
+                            {
+                                return;
+                            }
+
+                            var fileInfo = new FileInfo(folder);
+
+                            var fullPath = fileInfo.ResolveLinkTarget(true)?.FullName ?? fileInfo.FullName;
+                            ApplicationData folderData = new()
+                            {
+                                TitleName = fileInfo.Name,
+                                FileExtension = "Folder",
+                                Path = fullPath,
+                                Icon = _folderIcon,
+                            };
+                            OnApplicationAdded(new ApplicationAddedEventArgs
+                            {
+                                AppData = folderData,
+                            });
+                        }
+
+                        IEnumerable<string> files = Directory.EnumerateFiles(appDir, "*", SearchOption.TopDirectoryOnly).Where(file =>
                         {
                             return
                             (Path.GetExtension(file).ToLower() is ".nsp" && ConfigurationState.Instance.UI.ShownFileTypes.NSP.Value) ||
@@ -163,7 +189,26 @@ namespace Ryujinx.UI.App.Common
                         return;
                     }
 
-                    long fileSize = new FileInfo(applicationPath).Length;
+                    var fileInfo = new FileInfo(applicationPath);
+
+                    if ((fileInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
+                    {
+                        Console.WriteLine($"Found directory 2: {fileInfo.Name}");
+                        ApplicationData folder = new()
+                        {
+                            TitleName = fileInfo.Name,
+                            FileExtension = "Folder",
+                            Developer = "null",
+                            Path = applicationPath,
+                            Icon = _nsoIcon,
+                        };
+                        OnApplicationAdded(new ApplicationAddedEventArgs
+                        {
+                            AppData = folder,
+                        });
+                    }
+
+                    long fileSize = fileInfo.Length;
                     string titleName = "Unknown";
                     string titleId = "0000000000000000";
                     string developer = "Unknown";
diff --git a/src/Ryujinx.UI.Common/Resources/Icon_Folder.png b/src/Ryujinx.UI.Common/Resources/Icon_Folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba7ff44d74db4fbf1ef51bfee016c55d43d1bd7
GIT binary patch
literal 2091
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
UHO##n{0bEJp00i_>zopr0MsoQSpWb4

literal 0
HcmV?d00001

diff --git a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
index 387e998b0b..eb84aad61c 100644
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -15,6 +15,7 @@
     <None Remove="Resources\Icon_NSO.png" />
     <None Remove="Resources\Icon_NSP.png" />
     <None Remove="Resources\Icon_XCI.png" />
+    <None Remove="Resources\Icon_Folder.png" />
     <None Remove="Resources\Logo_Amiibo.png" />
     <None Remove="Resources\Logo_Discord.png" />
     <None Remove="Resources\Logo_GitHub.png" />
@@ -33,6 +34,7 @@
     <EmbeddedResource Include="Resources\Icon_NSO.png" />
     <EmbeddedResource Include="Resources\Icon_NSP.png" />
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
+    <EmbeddedResource Include="Resources\Icon_Folder.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
diff --git a/src/Ryujinx/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
index f257dc02c3..d44f0875a8 100644
--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -4,6 +4,7 @@ namespace Ryujinx.Ava.UI.Helpers
     {
         List,
         Grid,
+        Back,
         Chip,
     }
 }
diff --git a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
index 7da23648e1..9731123e97 100644
--- a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
@@ -13,6 +13,7 @@ namespace Ryujinx.Ava.UI.Helpers
         {
             { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
+            { Glyph.Back, char.ConvertFromUtf32((int)Symbol.Back) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
         };
 
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 17bd69b14c..c5de76f5ad 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -51,6 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private const int HotKeyPressDelayMs = 500;
 
         private ObservableCollection<ApplicationData> _applications;
+        private Queue<string> _pathHistory;
         private string _aspectStatusText;
 
         private string _loadHeading;
@@ -120,6 +121,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .Bind(out _appsObservableList).AsObservableList();
 
             _rendererWaitEvent = new AutoResetEvent(false);
+            _pathHistory = new Queue<string>();
 
             if (Program.PreviewerDetached)
             {
@@ -1281,6 +1283,34 @@ namespace Ryujinx.Ava.UI.ViewModels
             ShowConsole = !ShowConsole;
         }
 
+        public void OpenFolder(string path)
+        {
+            _pathHistory.Enqueue(path);
+            Applications.Clear();
+            List<string> SearchPaths = new List<string>();
+            SearchPaths.Add(path);
+            ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
+        }
+
+        public void NavigateBack()
+        {
+            if (_pathHistory.Count != 0)
+            {
+                string path = _pathHistory.Dequeue();
+                Applications.Clear();
+                if (_pathHistory.Count == 0)
+                {
+                    ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
+                }
+                else
+                {
+                    List<string> SearchPaths = new List<string>();
+                    SearchPaths.Add(path);
+                    ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
+                }
+            }
+        }
+
         public void SetListMode()
         {
             Glyph = Glyph.List;
diff --git a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
index cc21b5c60f..b49aaacc2a 100644
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
@@ -18,6 +18,19 @@
         Margin="0,0,0,5"
         Height="35"
         HorizontalAlignment="Stretch">
+        <Button
+            Width="80"
+            MinWidth="80"
+            Margin="5,2,0,2"
+            VerticalAlignment="Stretch"
+            Command="{Binding NavigateBack}">
+            <ui:FontIcon
+                Margin="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center"
+                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
+                Glyph="{helpers:GlyphValueConverter Back}" />
+        </Button>
         <Button
             Width="40"
             MinWidth="40"
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 33a9af5b61..def449a1d1 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -137,6 +137,11 @@ namespace Ryujinx.Ava.UI.Windows
         {
             if (args.Application != null)
             {
+                if (args.Application.FileExtension == "Folder")
+                {
+                    ViewModel.OpenFolder(args.Application.Path);
+                    return;
+                }
                 ViewModel.SelectedIcon = args.Application.Icon;
 
                 string path = new FileInfo(args.Application.Path).FullName;

From 5197e734998a5f0e6cdfcd35547dc5998a34d1c6 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Tue, 12 Mar 2024 23:54:08 -0400
Subject: [PATCH 02/10] fix formatting

---
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index c5de76f5ad..091b8204e6 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private const int HotKeyPressDelayMs = 500;
 
         private ObservableCollection<ApplicationData> _applications;
-        private Queue<string> _pathHistory;
+        private readonly Queue<string> _pathHistory;
         private string _aspectStatusText;
 
         private string _loadHeading;

From 8a610aafd7a8e65a0c30f769180ff09470759889 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Wed, 13 Mar 2024 13:43:29 -0400
Subject: [PATCH 03/10] Disable back button when not in a folder, hide
 filesize/time played info for folders

---
 src/Ryujinx.UI.Common/App/ApplicationData.cs      |  2 ++
 src/Ryujinx/UI/Controls/ApplicationListView.axaml |  1 +
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs  | 14 ++++++++++++++
 src/Ryujinx/UI/Views/Main/MainViewControls.axaml  |  3 ++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx.UI.Common/App/ApplicationData.cs b/src/Ryujinx.UI.Common/App/ApplicationData.cs
index 8cc7238e90..517a0c857b 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationData.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationData.cs
@@ -36,6 +36,8 @@ namespace Ryujinx.UI.App.Common
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);
 
+        public bool IsGame => FileExtension != "Folder";
+
         public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
         {
             using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index fecf088835..61e7977367 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -123,6 +123,7 @@
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Top"
                                     Orientation="Vertical"
+                                    IsVisible="{Binding IsGame}"
                                     Spacing="5">
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 091b8204e6..8a49dee050 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -85,6 +85,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private bool _showAll;
         private string _lastScannedAmiiboId;
         private bool _statusBarVisible;
+        private bool _isInFolder;
         private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
 
         private string _showUiKey = "F4";
@@ -670,6 +671,16 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsGrid => Glyph == Glyph.Grid;
         public bool IsList => Glyph == Glyph.List;
+        public bool IsInFolder
+        {
+            get => _isInFolder;
+            set
+            {
+                _isInFolder = value;
+
+                OnPropertyChanged();
+            }
+        }
 
         internal void Sort(bool isAscending)
         {
@@ -1286,6 +1297,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void OpenFolder(string path)
         {
             _pathHistory.Enqueue(path);
+            IsInFolder = _pathHistory.Count != 0;
+
             Applications.Clear();
             List<string> SearchPaths = new List<string>();
             SearchPaths.Add(path);
@@ -1309,6 +1322,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                     ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
                 }
             }
+            IsInFolder = _pathHistory.Count != 0;
         }
 
         public void SetListMode()
diff --git a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
index b49aaacc2a..cbd89de0e7 100644
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
@@ -23,7 +23,8 @@
             MinWidth="80"
             Margin="5,2,0,2"
             VerticalAlignment="Stretch"
-            Command="{Binding NavigateBack}">
+            Command="{Binding NavigateBack}"
+            IsEnabled="{Binding IsInFolder}">
             <ui:FontIcon
                 Margin="0"
                 HorizontalAlignment="Stretch"

From b5562f20143ab56b6f1257f98501cea04eff17d7 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Wed, 13 Mar 2024 15:03:07 -0400
Subject: [PATCH 04/10] Use font icon instead of image

---
 src/Ryujinx.UI.Common/App/ApplicationData.cs  |   2 ++
 .../App/ApplicationLibrary.cs                 |   8 +++--
 .../Resources/Icon_Folder.png                 | Bin 2091 -> 0 bytes
 .../Ryujinx.UI.Common.csproj                  |   2 --
 src/Ryujinx/Assets/Styles/Styles.xaml         |  32 ++++++++++++++++++
 .../UI/Controls/ApplicationGridView.axaml     |   9 +++++
 .../UI/Controls/ApplicationListView.axaml     |  10 ++++++
 src/Ryujinx/UI/Helpers/Glyph.cs               |   1 +
 src/Ryujinx/UI/Helpers/GlyphValueConverter.cs |   1 +
 9 files changed, 60 insertions(+), 5 deletions(-)
 delete mode 100644 src/Ryujinx.UI.Common/Resources/Icon_Folder.png

diff --git a/src/Ryujinx.UI.Common/App/ApplicationData.cs b/src/Ryujinx.UI.Common/App/ApplicationData.cs
index 517a0c857b..51ac87b5a8 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationData.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationData.cs
@@ -38,6 +38,8 @@ namespace Ryujinx.UI.App.Common
 
         public bool IsGame => FileExtension != "Folder";
 
+        public bool IsFolder => FileExtension == "Folder";
+
         public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
         {
             using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index ccd7070585..508794127d 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -41,7 +41,6 @@ namespace Ryujinx.UI.App.Common
         private readonly byte[] _ncaIcon;
         private readonly byte[] _nroIcon;
         private readonly byte[] _nsoIcon;
-        private readonly byte[] _folderIcon;
 
         private readonly VirtualFileSystem _virtualFileSystem;
         private Language _desiredTitleLanguage;
@@ -59,11 +58,15 @@ namespace Ryujinx.UI.App.Common
             _ncaIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NCA.png");
             _nroIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NRO.png");
             _nsoIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NSO.png");
-            _folderIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_Folder.png");
         }
 
         private static byte[] GetResourceBytes(string resourceName)
         {
+            if (resourceName == "")
+            {
+                return Array.Empty<byte>();
+            }
+
             Stream resourceStream = Assembly.GetCallingAssembly().GetManifestResourceStream(resourceName);
             byte[] resourceByteArray = new byte[resourceStream.Length];
 
@@ -131,7 +134,6 @@ namespace Ryujinx.UI.App.Common
                                 TitleName = fileInfo.Name,
                                 FileExtension = "Folder",
                                 Path = fullPath,
-                                Icon = _folderIcon,
                             };
                             OnApplicationAdded(new ApplicationAddedEventArgs
                             {
diff --git a/src/Ryujinx.UI.Common/Resources/Icon_Folder.png b/src/Ryujinx.UI.Common/Resources/Icon_Folder.png
deleted file mode 100644
index dba7ff44d74db4fbf1ef51bfee016c55d43d1bd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2091
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
UHO##n{0bEJp00i_>zopr0MsoQSpWb4

diff --git a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
index eb84aad61c..387e998b0b 100644
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -15,7 +15,6 @@
     <None Remove="Resources\Icon_NSO.png" />
     <None Remove="Resources\Icon_NSP.png" />
     <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Icon_Folder.png" />
     <None Remove="Resources\Logo_Amiibo.png" />
     <None Remove="Resources\Logo_Discord.png" />
     <None Remove="Resources\Logo_GitHub.png" />
@@ -34,7 +33,6 @@
     <EmbeddedResource Include="Resources\Icon_NSO.png" />
     <EmbeddedResource Include="Resources\Icon_NSP.png" />
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
-    <EmbeddedResource Include="Resources\Icon_Folder.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index f7f64be22f..20c435d08e 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -86,6 +86,38 @@
         <Setter Property="Width"
                 Value="120" />
     </Style>
+    <Style Selector="ui|SymbolIcon.listSmall">
+        <Setter Property="FontSize"
+                Value="50" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listNormal">
+        <Setter Property="FontSize"
+                Value="80" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listLarge">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listHuge">
+        <Setter Property="FontSize"
+                Value="120" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridSmall">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridNormal">
+        <Setter Property="FontSize"
+                Value="130" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridLarge">
+        <Setter Property="FontSize"
+                Value="140" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridHuge">
+        <Setter Property="FontSize"
+                Value="180" />
+    </Style>
     <Style Selector="#TitleBarHost &gt; Image">
         <Setter Property="Margin"
                 Value="10" />
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 2dc95662a1..7ba6642ab7 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -69,7 +69,16 @@
                                     Grid.Row="0"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Top"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Classes.gridHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.gridLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.gridNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.gridSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Panel
                                     Grid.Row="1"
                                     Height="50"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 61e7977367..ce1ce64538 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -71,7 +71,17 @@
                                     Classes.large="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
                                     Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
                                     Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.RowSpan="3"
+                                    Grid.Column="0"
+                                    Classes.listHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.listLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.listNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.listSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Border
                                     Grid.Column="2"
                                     Margin="0,0,5,0"
diff --git a/src/Ryujinx/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
index d44f0875a8..b071140b83 100644
--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -6,5 +6,6 @@ namespace Ryujinx.Ava.UI.Helpers
         Grid,
         Back,
         Chip,
+        Folder,
     }
 }
diff --git a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
index 9731123e97..4fe7a5d1fb 100644
--- a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
@@ -15,6 +15,7 @@ namespace Ryujinx.Ava.UI.Helpers
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
             { Glyph.Back, char.ConvertFromUtf32((int)Symbol.Back) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Folder, char.ConvertFromUtf32(61739) },
         };
 
         public GlyphValueConverter(string key)

From 8282c7b6c67d43255591048405a8b10e4263d7ab Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Wed, 13 Mar 2024 18:43:54 -0400
Subject: [PATCH 05/10] fixed path history and the reload button

---
 .../App/ApplicationLibrary.cs                 | 21 +------------------
 .../UI/ViewModels/MainWindowViewModel.cs      | 14 +++++++------
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    | 12 ++++++++++-
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index 508794127d..013ff3607c 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -191,26 +191,7 @@ namespace Ryujinx.UI.App.Common
                         return;
                     }
 
-                    var fileInfo = new FileInfo(applicationPath);
-
-                    if ((fileInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
-                    {
-                        Console.WriteLine($"Found directory 2: {fileInfo.Name}");
-                        ApplicationData folder = new()
-                        {
-                            TitleName = fileInfo.Name,
-                            FileExtension = "Folder",
-                            Developer = "null",
-                            Path = applicationPath,
-                            Icon = _nsoIcon,
-                        };
-                        OnApplicationAdded(new ApplicationAddedEventArgs
-                        {
-                            AppData = folder,
-                        });
-                    }
-
-                    long fileSize = fileInfo.Length;
+                    long fileSize = new FileInfo(applicationPath).Length;
                     string titleName = "Unknown";
                     string titleId = "0000000000000000";
                     string developer = "Unknown";
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 8a49dee050..94f7dc8005 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -51,7 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private const int HotKeyPressDelayMs = 500;
 
         private ObservableCollection<ApplicationData> _applications;
-        private readonly Queue<string> _pathHistory;
+        private readonly Stack<string> _pathHistory;
         private string _aspectStatusText;
 
         private string _loadHeading;
@@ -122,7 +122,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 .Bind(out _appsObservableList).AsObservableList();
 
             _rendererWaitEvent = new AutoResetEvent(false);
-            _pathHistory = new Queue<string>();
+            _pathHistory = new Stack<string>();
 
             if (Program.PreviewerDetached)
             {
@@ -217,6 +217,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public Stack<string> PathHistory => _pathHistory;
+
         public bool IsPaused
         {
             get => _isPaused;
@@ -1296,7 +1298,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public void OpenFolder(string path)
         {
-            _pathHistory.Enqueue(path);
+            _pathHistory.Push(path);
             IsInFolder = _pathHistory.Count != 0;
 
             Applications.Clear();
@@ -1309,7 +1311,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         {
             if (_pathHistory.Count != 0)
             {
-                string path = _pathHistory.Dequeue();
+                _pathHistory.Pop();
                 Applications.Clear();
                 if (_pathHistory.Count == 0)
                 {
@@ -1317,8 +1319,8 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
                 else
                 {
-                    List<string> SearchPaths = new List<string>();
-                    SearchPaths.Add(path);
+                    List<string> SearchPaths = new();
+                    SearchPaths.Add(_pathHistory.Peek());
                     ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
                 }
             }
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index def449a1d1..792fe24441 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -23,6 +23,7 @@ using Ryujinx.UI.Common;
 using Ryujinx.UI.Common.Configuration;
 using Ryujinx.UI.Common.Helper;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Versioning;
 using System.Threading;
@@ -542,7 +543,16 @@ namespace Ryujinx.Ava.UI.Windows
 
             Thread applicationLibraryThread = new(() =>
             {
-                ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
+                if (ViewModel.IsInFolder)
+                {
+                    List<string> SearchPaths = new();
+                    SearchPaths.Add(ViewModel.PathHistory.Peek());
+                    ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
+                }
+                else
+                {
+                    ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
+                }
 
                 _isLoading = false;
             })

From 820d11fbcae7312ec99bd7cf0df9aedf94fd0b43 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Thu, 14 Mar 2024 21:36:09 -0400
Subject: [PATCH 06/10] Add setting "Show Folders" to toggle using folders
 based on system directories

---
 .../App/ApplicationLibrary.cs                 | 43 +++++++++++--------
 .../Configuration/ConfigurationFileFormat.cs  |  7 ++-
 .../Configuration/ConfigurationState.cs       | 18 ++++++++
 src/Ryujinx/Assets/Locales/de_DE.json         |  1 +
 src/Ryujinx/Assets/Locales/el_GR.json         |  1 +
 src/Ryujinx/Assets/Locales/en_US.json         |  1 +
 src/Ryujinx/Assets/Locales/es_ES.json         |  1 +
 src/Ryujinx/Assets/Locales/fr_FR.json         |  1 +
 src/Ryujinx/Assets/Locales/he_IL.json         |  1 +
 src/Ryujinx/Assets/Locales/it_IT.json         |  1 +
 src/Ryujinx/Assets/Locales/ja_JP.json         |  1 +
 src/Ryujinx/Assets/Locales/ko_KR.json         |  1 +
 src/Ryujinx/Assets/Locales/pl_PL.json         |  1 +
 src/Ryujinx/Assets/Locales/pt_BR.json         |  1 +
 src/Ryujinx/Assets/Locales/ru_RU.json         |  1 +
 src/Ryujinx/Assets/Locales/tr_TR.json         |  1 +
 src/Ryujinx/Assets/Locales/uk_UA.json         |  1 +
 src/Ryujinx/Assets/Locales/zh_CN.json         |  1 +
 src/Ryujinx/Assets/Locales/zh_TW.json         |  1 +
 .../UI/ViewModels/SettingsViewModel.cs        |  3 ++
 .../UI/Views/Settings/SettingsUIView.axaml    |  3 ++
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    |  6 +++
 22 files changed, 77 insertions(+), 19 deletions(-)

diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index 013ff3607c..56f1a7a570 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -118,30 +118,37 @@ namespace Ryujinx.UI.App.Common
 
                     try
                     {
-                        IEnumerable<string> folders = Directory.EnumerateDirectories(appDir, "*", SearchOption.TopDirectoryOnly);
-                        foreach (string folder in folders)
+                        var FileSearchOption = SearchOption.AllDirectories;
+
+                        if (ConfigurationState.Instance.UI.UseSystemGameFolders)
                         {
-                            if (_cancellationToken.Token.IsCancellationRequested)
+                            IEnumerable<string> folders = Directory.EnumerateDirectories(appDir, "*", SearchOption.TopDirectoryOnly);
+                            foreach (string folder in folders)
                             {
-                                return;
+                                if (_cancellationToken.Token.IsCancellationRequested)
+                                {
+                                    return;
+                                }
+
+                                var fileInfo = new FileInfo(folder);
+
+                                var fullPath = fileInfo.ResolveLinkTarget(true)?.FullName ?? fileInfo.FullName;
+                                ApplicationData folderData = new()
+                                {
+                                    TitleName = fileInfo.Name,
+                                    FileExtension = "Folder",
+                                    Path = fullPath,
+                                };
+                                OnApplicationAdded(new ApplicationAddedEventArgs
+                                {
+                                    AppData = folderData,
+                                });
                             }
 
-                            var fileInfo = new FileInfo(folder);
-
-                            var fullPath = fileInfo.ResolveLinkTarget(true)?.FullName ?? fileInfo.FullName;
-                            ApplicationData folderData = new()
-                            {
-                                TitleName = fileInfo.Name,
-                                FileExtension = "Folder",
-                                Path = fullPath,
-                            };
-                            OnApplicationAdded(new ApplicationAddedEventArgs
-                            {
-                                AppData = folderData,
-                            });
+                            FileSearchOption = SearchOption.TopDirectoryOnly;
                         }
 
-                        IEnumerable<string> files = Directory.EnumerateFiles(appDir, "*", SearchOption.TopDirectoryOnly).Where(file =>
+                        IEnumerable<string> files = Directory.EnumerateFiles(appDir, "*", FileSearchOption).Where(file =>
                         {
                             return
                             (Path.GetExtension(file).ToLower() is ".nsp" && ConfigurationState.Instance.UI.ShownFileTypes.NSP.Value) ||
diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
index 0f6c21ef24..2c82979c9a 100644
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationFileFormat.cs
@@ -15,7 +15,7 @@ namespace Ryujinx.UI.Common.Configuration
         /// <summary>
         /// The current version of the file format
         /// </summary>
-        public const int CurrentVersion = 49;
+        public const int CurrentVersion = 50;
 
         /// <summary>
         /// Version of the configuration file format
@@ -317,6 +317,11 @@ namespace Ryujinx.UI.Common.Configuration
         /// </summary>
         public bool ShowConsole { get; set; }
 
+        /// <summary>
+        /// use system directories when listing games
+        /// </summary>
+        public bool UseSystemGameFolders { get; set; }
+
         /// <summary>
         /// Enable or disable keyboard support (Independent from controllers binding)
         /// </summary>
diff --git a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
index b7f36087cb..c497bb418d 100644
--- a/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
@@ -186,6 +186,11 @@ namespace Ryujinx.UI.Common.Configuration
             /// </summary>
             public ReactiveObject<bool> IsAscendingOrder { get; private set; }
 
+            /// <summary>
+            /// use system directories when listing games
+            /// </summary>
+            public ReactiveObject<bool> UseSystemGameFolders { get; private set; }
+
             public UISection()
             {
                 GuiColumns = new Columns();
@@ -204,6 +209,7 @@ namespace Ryujinx.UI.Common.Configuration
                 IsAscendingOrder = new ReactiveObject<bool>();
                 LanguageCode = new ReactiveObject<string>();
                 ShowConsole = new ReactiveObject<bool>();
+                UseSystemGameFolders = new ReactiveObject<bool>();
                 ShowConsole.Event += static (s, e) => { ConsoleHelper.SetConsoleWindowState(e.NewValue); };
             }
         }
@@ -741,6 +747,7 @@ namespace Ryujinx.UI.Common.Configuration
                 IsAscendingOrder = UI.IsAscendingOrder,
                 StartFullscreen = UI.StartFullscreen,
                 ShowConsole = UI.ShowConsole,
+                UseSystemGameFolders = UI.UseSystemGameFolders,
                 EnableKeyboard = Hid.EnableKeyboard,
                 EnableMouse = Hid.EnableMouse,
                 Hotkeys = Hid.Hotkeys,
@@ -836,6 +843,7 @@ namespace Ryujinx.UI.Common.Configuration
             UI.IsAscendingOrder.Value = true;
             UI.StartFullscreen.Value = false;
             UI.ShowConsole.Value = true;
+            UI.UseSystemGameFolders.Value = true;
             UI.WindowStartup.WindowSizeWidth.Value = 1280;
             UI.WindowStartup.WindowSizeHeight.Value = 760;
             UI.WindowStartup.WindowPositionX.Value = 0;
@@ -1442,6 +1450,15 @@ namespace Ryujinx.UI.Common.Configuration
                 configurationFileUpdated = true;
             }
 
+            if (configurationFileFormat.Version < 50)
+            {
+                Ryujinx.Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 50.");
+
+                configurationFileFormat.UseSystemGameFolders = true;
+
+                configurationFileUpdated = true;
+            }
+
             Logger.EnableFileLog.Value = configurationFileFormat.EnableFileLog;
             Graphics.ResScale.Value = configurationFileFormat.ResScale;
             Graphics.ResScaleCustom.Value = configurationFileFormat.ResScaleCustom;
@@ -1518,6 +1535,7 @@ namespace Ryujinx.UI.Common.Configuration
             UI.ApplicationSort.Value = configurationFileFormat.ApplicationSort;
             UI.StartFullscreen.Value = configurationFileFormat.StartFullscreen;
             UI.ShowConsole.Value = configurationFileFormat.ShowConsole;
+            UI.UseSystemGameFolders.Value = configurationFileFormat.UseSystemGameFolders;
             UI.WindowStartup.WindowSizeWidth.Value = configurationFileFormat.WindowStartup.WindowSizeWidth;
             UI.WindowStartup.WindowSizeHeight.Value = configurationFileFormat.WindowStartup.WindowSizeHeight;
             UI.WindowStartup.WindowPositionX.Value = configurationFileFormat.WindowStartup.WindowPositionX;
diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json
index 7cdcdf5a2a..796622cf86 100644
--- a/src/Ryujinx/Assets/Locales/de_DE.json
+++ b/src/Ryujinx/Assets/Locales/de_DE.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Oberfläche",
   "SettingsTabGeneralGeneral": "Allgemein",
   "SettingsTabGeneralEnableDiscordRichPresence": "Aktiviere die Statusanzeige für Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Beim Start nach Updates suchen",
   "SettingsTabGeneralShowConfirmExitDialog": "Zeige den \"Beenden bestätigen\"-Dialog",
   "SettingsTabGeneralHideCursor": "Mauszeiger ausblenden",
diff --git a/src/Ryujinx/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json
index 59f50ad923..b55e53fb55 100644
--- a/src/Ryujinx/Assets/Locales/el_GR.json
+++ b/src/Ryujinx/Assets/Locales/el_GR.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Εμφάνιση",
   "SettingsTabGeneralGeneral": "Γενικά",
   "SettingsTabGeneralEnableDiscordRichPresence": "Ενεργοποίηση Εμπλουτισμένης Παρουσίας Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Έλεγχος για Ενημερώσεις στην Εκκίνηση",
   "SettingsTabGeneralShowConfirmExitDialog": "Εμφάνιση διαλόγου \"Επιβεβαίωση Εξόδου\".",
   "SettingsTabGeneralHideCursor": "Απόκρυψη Κέρσορα:",
diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json
index 2febf90ec3..e4638c00ea 100644
--- a/src/Ryujinx/Assets/Locales/en_US.json
+++ b/src/Ryujinx/Assets/Locales/en_US.json
@@ -90,6 +90,7 @@
   "SettingsTabGeneral": "User Interface",
   "SettingsTabGeneralGeneral": "General",
   "SettingsTabGeneralEnableDiscordRichPresence": "Enable Discord Rich Presence",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Check for Updates on Launch",
   "SettingsTabGeneralShowConfirmExitDialog": "Show \"Confirm Exit\" Dialog",
   "SettingsTabGeneralHideCursor": "Hide Cursor:",
diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json
index 91bcd8f114..d92a803fa5 100644
--- a/src/Ryujinx/Assets/Locales/es_ES.json
+++ b/src/Ryujinx/Assets/Locales/es_ES.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Interfaz de usuario",
   "SettingsTabGeneralGeneral": "General",
   "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar estado en Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Buscar actualizaciones al iniciar",
   "SettingsTabGeneralShowConfirmExitDialog": "Mostrar diálogo de confirmación al cerrar",
   "SettingsTabGeneralHideCursor": "Esconder el cursor:",
diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json
index 5bab6f7b2c..550322309b 100644
--- a/src/Ryujinx/Assets/Locales/fr_FR.json
+++ b/src/Ryujinx/Assets/Locales/fr_FR.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Interface Utilisateur",
   "SettingsTabGeneralGeneral": "Général",
   "SettingsTabGeneralEnableDiscordRichPresence": "Activer Discord Rich Presence",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Vérifier les mises à jour au démarrage",
   "SettingsTabGeneralShowConfirmExitDialog": "Afficher le message de \"Confirmation de sortie\"",
   "SettingsTabGeneralHideCursor": "Masquer le Curseur :",
diff --git a/src/Ryujinx/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json
index e5caf445a7..7d4b67a5c0 100644
--- a/src/Ryujinx/Assets/Locales/he_IL.json
+++ b/src/Ryujinx/Assets/Locales/he_IL.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "ממשק משתמש",
   "SettingsTabGeneralGeneral": "כללי",
   "SettingsTabGeneralEnableDiscordRichPresence": "הפעלת תצוגה עשירה בדיסקורד",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "בדוק אם קיימים עדכונים בהפעלה",
   "SettingsTabGeneralShowConfirmExitDialog": "הראה דיאלוג \"אשר יציאה\"",
   "SettingsTabGeneralHideCursor": "הסתר את הסמן",
diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json
index 5aff7a7ec3..56b492b9d1 100644
--- a/src/Ryujinx/Assets/Locales/it_IT.json
+++ b/src/Ryujinx/Assets/Locales/it_IT.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Interfaccia utente",
   "SettingsTabGeneralGeneral": "Generali",
   "SettingsTabGeneralEnableDiscordRichPresence": "Attiva Discord Rich Presence",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Controlla aggiornamenti all'avvio",
   "SettingsTabGeneralShowConfirmExitDialog": "Mostra dialogo \"Conferma Uscita\"",
   "SettingsTabGeneralHideCursor": "Nascondi il cursore:",
diff --git a/src/Ryujinx/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json
index 5b31c5f206..040bf433a7 100644
--- a/src/Ryujinx/Assets/Locales/ja_JP.json
+++ b/src/Ryujinx/Assets/Locales/ja_JP.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "ユーザインタフェース",
   "SettingsTabGeneralGeneral": "一般",
   "SettingsTabGeneralEnableDiscordRichPresence": "Discord リッチプレゼンスを有効にする",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "起動時にアップデートを確認する",
   "SettingsTabGeneralShowConfirmExitDialog": "\"終了を確認\" ダイアログを表示する",
   "SettingsTabGeneralHideCursor": "マウスカーソルを非表示",
diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json
index cdc6172224..35b2eee7ca 100644
--- a/src/Ryujinx/Assets/Locales/ko_KR.json
+++ b/src/Ryujinx/Assets/Locales/ko_KR.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "사용자 인터페이스",
   "SettingsTabGeneralGeneral": "일반",
   "SettingsTabGeneralEnableDiscordRichPresence": "디스코드 활동 상태 활성화",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "시작 시, 업데이트 확인",
   "SettingsTabGeneralShowConfirmExitDialog": "\"종료 확인\" 대화 상자 표시",
   "SettingsTabGeneralHideCursor": "마우스 커서 숨기기",
diff --git a/src/Ryujinx/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json
index 7edf41e845..5af410a8c3 100644
--- a/src/Ryujinx/Assets/Locales/pl_PL.json
+++ b/src/Ryujinx/Assets/Locales/pl_PL.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Interfejs Użytkownika",
   "SettingsTabGeneralGeneral": "Ogólne",
   "SettingsTabGeneralEnableDiscordRichPresence": "Włącz Bogatą Obecność Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Sprawdź Aktualizacje przy Uruchomieniu",
   "SettingsTabGeneralShowConfirmExitDialog": "Pokaż Okno Dialogowe \"Potwierdzenia Wyjścia\"",
   "SettingsTabGeneralHideCursor": "Ukryj kursor:",
diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json
index 8909a84fec..5959ae4153 100644
--- a/src/Ryujinx/Assets/Locales/pt_BR.json
+++ b/src/Ryujinx/Assets/Locales/pt_BR.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Geral",
   "SettingsTabGeneralGeneral": "Geral",
   "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar Rich Presence do Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Verificar se há atualizações ao iniciar",
   "SettingsTabGeneralShowConfirmExitDialog": "Exibir diálogo de confirmação ao sair",
   "SettingsTabGeneralHideCursor": "Esconder o cursor do mouse:",
diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json
index a2128e52e5..bfa87514eb 100644
--- a/src/Ryujinx/Assets/Locales/ru_RU.json
+++ b/src/Ryujinx/Assets/Locales/ru_RU.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Пользовательский интерфейс",
   "SettingsTabGeneralGeneral": "Общее",
   "SettingsTabGeneralEnableDiscordRichPresence": "Включить Discord Rich Presence",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Проверять наличие обновлений при запуске",
   "SettingsTabGeneralShowConfirmExitDialog": "Показать диалоговое окно \"Подтвердить выход\"",
   "SettingsTabGeneralHideCursor": "Скрыть курсор",
diff --git a/src/Ryujinx/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json
index 3f70a781d6..14e9880285 100644
--- a/src/Ryujinx/Assets/Locales/tr_TR.json
+++ b/src/Ryujinx/Assets/Locales/tr_TR.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Kullancı Arayüzü",
   "SettingsTabGeneralGeneral": "Genel",
   "SettingsTabGeneralEnableDiscordRichPresence": "Discord Zengin İçerik'i Etkinleştir",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Her Açılışta Güncellemeleri Denetle",
   "SettingsTabGeneralShowConfirmExitDialog": "\"Çıkışı Onayla\" Diyaloğunu Göster",
   "SettingsTabGeneralHideCursor": "İşaretçiyi Gizle:",
diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json
index a119fb4b71..2eb3509993 100644
--- a/src/Ryujinx/Assets/Locales/uk_UA.json
+++ b/src/Ryujinx/Assets/Locales/uk_UA.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "Інтерфейс користувача",
   "SettingsTabGeneralGeneral": "Загальні",
   "SettingsTabGeneralEnableDiscordRichPresence": "Увімкнути розширену присутність Discord",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Перевіряти наявність оновлень під час запуску",
   "SettingsTabGeneralShowConfirmExitDialog": "Показати діалогове вікно «Підтвердити вихід».",
   "SettingsTabGeneralHideCursor": "Hide Cursor:",
diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json
index d09a80ec6e..7c42adba5a 100644
--- a/src/Ryujinx/Assets/Locales/zh_CN.json
+++ b/src/Ryujinx/Assets/Locales/zh_CN.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "用户界面",
   "SettingsTabGeneralGeneral": "常规",
   "SettingsTabGeneralEnableDiscordRichPresence": "启用 Discord 在线状态展示",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "自动检查更新",
   "SettingsTabGeneralShowConfirmExitDialog": "显示 \"确认退出\" 对话框",
   "SettingsTabGeneralHideCursor": "隐藏鼠标指针：",
diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json
index a2f59f60dd..4afeea5316 100644
--- a/src/Ryujinx/Assets/Locales/zh_TW.json
+++ b/src/Ryujinx/Assets/Locales/zh_TW.json
@@ -85,6 +85,7 @@
   "SettingsTabGeneral": "使用者介面",
   "SettingsTabGeneralGeneral": "一般",
   "SettingsTabGeneralEnableDiscordRichPresence": "啟用 Discord 動態狀態展示",
+  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "自動檢查更新",
   "SettingsTabGeneralShowConfirmExitDialog": "顯示「確認離開」對話框",
   "SettingsTabGeneralHideCursor": "隱藏滑鼠遊標：",
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index bcaa086000..2a6149981f 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -132,6 +132,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool EnableDiscordIntegration { get; set; }
         public bool CheckUpdatesOnStart { get; set; }
         public bool ShowConfirmExit { get; set; }
+        public bool UseSystemGameFolders { get; set; }
         public int HideCursor { get; set; }
         public bool EnableDockedMode { get; set; }
         public bool EnableKeyboard { get; set; }
@@ -405,6 +406,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             EnableDiscordIntegration = config.EnableDiscordIntegration;
             CheckUpdatesOnStart = config.CheckUpdatesOnStart;
             ShowConfirmExit = config.ShowConfirmExit;
+            UseSystemGameFolders = config.UI.UseSystemGameFolders;
             HideCursor = (int)config.HideCursor.Value;
 
             GameDirectories.Clear();
@@ -489,6 +491,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
             config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
+            config.UI.UseSystemGameFolders.Value = UseSystemGameFolders;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
 
             if (_directoryChanged)
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index 6504637e6c..ccf87641f5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
@@ -36,6 +36,9 @@
                     <CheckBox IsChecked="{Binding ShowConfirmExit}">
                         <TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
                     </CheckBox>
+                    <CheckBox IsChecked="{Binding UseSystemGameFolders}">
+                        <TextBlock Text="{locale:Locale SettingsTabGeneralUseSystemGameFolders}" />
+                    </CheckBox>
                     <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center"
                                    Text="{locale:Locale SettingsTabGeneralHideCursor}"
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 792fe24441..0b32d98008 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -541,6 +541,12 @@ namespace Ryujinx.Ava.UI.Windows
 
             _isLoading = true;
 
+            if (ViewModel.IsInFolder && !ConfigurationState.Instance.UI.UseSystemGameFolders)
+            {
+                ViewModel.PathHistory.Clear();
+                ViewModel.IsInFolder = false;
+            }
+
             Thread applicationLibraryThread = new(() =>
             {
                 if (ViewModel.IsInFolder)

From 1ef15e5107048b9e423a0cbd44d24f2015954cb4 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Thu, 14 Mar 2024 22:36:49 -0400
Subject: [PATCH 07/10] Updating the game list when navigating folders is now
 on a separate thread like before. tweaked grid mode icon sizes

---
 .../App/ApplicationLibrary.cs                 | 23 ++++++++++++
 src/Ryujinx/Assets/Styles/Styles.xaml         |  6 ++--
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    | 35 +++++--------------
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index 56f1a7a570..d38b92650d 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -45,6 +45,7 @@ namespace Ryujinx.UI.App.Common
         private readonly VirtualFileSystem _virtualFileSystem;
         private Language _desiredTitleLanguage;
         private CancellationTokenSource _cancellationToken;
+        private bool _isLoading;
 
         private static readonly ApplicationJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
         private static readonly TitleUpdateMetadataJsonSerializerContext _titleSerializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -89,6 +90,28 @@ namespace Ryujinx.UI.App.Common
         }
 
         public void LoadApplications(List<string> appDirs, Language desiredTitleLanguage)
+        {
+            if (_isLoading)
+            {
+                return;
+            }
+
+            _isLoading = true;
+
+            Thread applicationLibraryThread = new(() =>
+            {
+                LoadApplicationsReal(appDirs, desiredTitleLanguage);
+
+                _isLoading = false;
+            })
+            {
+                Name = "GUI.ApplicationLibraryThread",
+                IsBackground = true,
+            };
+            applicationLibraryThread.Start();
+        }
+
+        private void LoadApplicationsReal(List<string> appDirs, Language desiredTitleLanguage)
         {
             int numApplicationsFound = 0;
             int numApplicationsLoaded = 0;
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index 20c435d08e..34b0f457c9 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -108,15 +108,15 @@
     </Style>
     <Style Selector="ui|SymbolIcon.gridNormal">
         <Setter Property="FontSize"
-                Value="130" />
+                Value="120" />
     </Style>
     <Style Selector="ui|SymbolIcon.gridLarge">
         <Setter Property="FontSize"
-                Value="140" />
+                Value="160" />
     </Style>
     <Style Selector="ui|SymbolIcon.gridHuge">
         <Setter Property="FontSize"
-                Value="180" />
+                Value="200" />
     </Style>
     <Style Selector="#TitleBarHost &gt; Image">
         <Setter Property="Margin"
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index 0b32d98008..a792b9289c 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -35,8 +35,6 @@ namespace Ryujinx.Ava.UI.Windows
     {
         internal static MainWindowViewModel MainWindowViewModel { get; private set; }
 
-        private bool _isLoading;
-
         private UserChannelPersistence _userChannelPersistence;
         private static bool _deferLoad;
         private static string _launchPath;
@@ -534,39 +532,22 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void ReloadGameList()
         {
-            if (_isLoading)
-            {
-                return;
-            }
-
-            _isLoading = true;
-
             if (ViewModel.IsInFolder && !ConfigurationState.Instance.UI.UseSystemGameFolders)
             {
                 ViewModel.PathHistory.Clear();
                 ViewModel.IsInFolder = false;
             }
 
-            Thread applicationLibraryThread = new(() =>
+            if (ViewModel.IsInFolder)
             {
-                if (ViewModel.IsInFolder)
-                {
-                    List<string> SearchPaths = new();
-                    SearchPaths.Add(ViewModel.PathHistory.Peek());
-                    ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
-                }
-                else
-                {
-                    ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
-                }
-
-                _isLoading = false;
-            })
+                List<string> SearchPaths = new();
+                SearchPaths.Add(ViewModel.PathHistory.Peek());
+                ApplicationLibrary.LoadApplications(SearchPaths, ConfigurationState.Instance.System.Language);
+            }
+            else
             {
-                Name = "GUI.ApplicationLibraryThread",
-                IsBackground = true,
-            };
-            applicationLibraryThread.Start();
+                ApplicationLibrary.LoadApplications(ConfigurationState.Instance.UI.GameDirs, ConfigurationState.Instance.System.Language);
+            }
         }
     }
 }

From 77613827401082e9f2872fa2b4f36f66ea5e007b Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Mon, 18 Mar 2024 17:42:32 -0400
Subject: [PATCH 08/10] Hide back button when folders are disabled, reload game
 list when the folder setting is changed

---
 src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs | 12 ++++++++++++
 src/Ryujinx/UI/ViewModels/SettingsViewModel.cs   |  9 ++++++++-
 src/Ryujinx/UI/Views/Main/MainViewControls.axaml |  1 +
 src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs   | 13 +++++++++++--
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 94f7dc8005..4638724013 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -86,6 +86,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private string _lastScannedAmiiboId;
         private bool _statusBarVisible;
         private bool _isInFolder;
+        private bool _foldersEnabled;
         private ReadOnlyObservableCollection<ApplicationData> _appsObservableList;
 
         private string _showUiKey = "F4";
@@ -123,6 +124,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             _rendererWaitEvent = new AutoResetEvent(false);
             _pathHistory = new Stack<string>();
+            FoldersEnabled = ConfigurationState.Instance.UI.UseSystemGameFolders;
 
             if (Program.PreviewerDetached)
             {
@@ -683,6 +685,16 @@ namespace Ryujinx.Ava.UI.ViewModels
                 OnPropertyChanged();
             }
         }
+        public bool FoldersEnabled
+        {
+            get => _foldersEnabled;
+            set
+            {
+                _foldersEnabled = value;
+
+                OnPropertyChanged();
+            }
+        }
 
         internal void Sort(bool isAscending)
         {
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 2a6149981f..8c61104bb5 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
@@ -116,6 +116,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool IsHypervisorAvailable => OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
 
+        public bool FolderModeChanged;
         public bool DirectoryChanged
         {
             get => _directoryChanged;
@@ -491,7 +492,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
             config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
             config.ShowConfirmExit.Value = ShowConfirmExit;
-            config.UI.UseSystemGameFolders.Value = UseSystemGameFolders;
             config.HideCursor.Value = (HideCursorMode)HideCursor;
 
             if (_directoryChanged)
@@ -500,6 +500,12 @@ namespace Ryujinx.Ava.UI.ViewModels
                 config.UI.GameDirs.Value = gameDirs;
             }
 
+            if (UseSystemGameFolders != config.UI.UseSystemGameFolders.Value)
+            {
+                FolderModeChanged = true;
+            }
+            config.UI.UseSystemGameFolders.Value = UseSystemGameFolders;
+
             config.UI.BaseStyle.Value = BaseStyleIndex == 0 ? "Light" : "Dark";
 
             // Input
@@ -590,6 +596,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             SaveSettingsEvent?.Invoke();
 
             _directoryChanged = false;
+            FolderModeChanged = false;
         }
 
         private static void RevertIfNotSaved()
diff --git a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
index cbd89de0e7..5b232af927 100644
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
@@ -24,6 +24,7 @@
             Margin="5,2,0,2"
             VerticalAlignment="Stretch"
             Command="{Binding NavigateBack}"
+            IsVisible="{Binding FoldersEnabled}"
             IsEnabled="{Binding IsInFolder}">
             <ui:FontIcon
                 Margin="0"
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
index d7bb0b8837..f3491079fd 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -39,9 +39,18 @@ namespace Ryujinx.Ava.UI.Windows
         {
             InputPage.ControllerSettings?.SaveCurrentProfile();
 
-            if (Owner is MainWindow window && ViewModel.DirectoryChanged)
+            if (Owner is MainWindow window)
             {
-                window.LoadApplications();
+                if (ViewModel.DirectoryChanged)
+                {
+                    window.LoadApplications();
+                }
+
+                if (ViewModel.FolderModeChanged)
+                {
+                    window.LoadApplications();
+                    window.ViewModel.FoldersEnabled = ViewModel.UseSystemGameFolders;
+                }
             }
         }
 

From 1b0fe01caea828bf7de8df841695170ab2f0905f Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Mon, 18 Mar 2024 18:08:21 -0400
Subject: [PATCH 09/10] patch gtk, small code cleanup

---
 src/Ryujinx.Gtk3/UI/MainWindow.cs                | 2 ++
 src/Ryujinx/UI/Helpers/Glyph.cs                  | 2 --
 src/Ryujinx/UI/Helpers/GlyphValueConverter.cs    | 2 --
 src/Ryujinx/UI/Views/Main/MainViewControls.axaml | 7 +------
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Ryujinx.Gtk3/UI/MainWindow.cs b/src/Ryujinx.Gtk3/UI/MainWindow.cs
index d1ca6ce6ab..2af3eb3448 100644
--- a/src/Ryujinx.Gtk3/UI/MainWindow.cs
+++ b/src/Ryujinx.Gtk3/UI/MainWindow.cs
@@ -215,6 +215,8 @@ namespace Ryujinx.UI
                 _startFullScreen.Active = true;
             }
 
+            ConfigurationState.Instance.UI.UseSystemGameFolders.Value = false;
+
             _showConsole.Active = ConfigurationState.Instance.UI.ShowConsole.Value;
             _showConsole.Visible = ConsoleHelper.SetConsoleWindowStateSupported;
 
diff --git a/src/Ryujinx/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
index b071140b83..f257dc02c3 100644
--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -4,8 +4,6 @@ namespace Ryujinx.Ava.UI.Helpers
     {
         List,
         Grid,
-        Back,
         Chip,
-        Folder,
     }
 }
diff --git a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
index 4fe7a5d1fb..7da23648e1 100644
--- a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
@@ -13,9 +13,7 @@ namespace Ryujinx.Ava.UI.Helpers
         {
             { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
-            { Glyph.Back, char.ConvertFromUtf32((int)Symbol.Back) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
-            { Glyph.Folder, char.ConvertFromUtf32(61739) },
         };
 
         public GlyphValueConverter(string key)
diff --git a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
index 5b232af927..bd73725294 100644
--- a/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainViewControls.axaml
@@ -26,12 +26,7 @@
             Command="{Binding NavigateBack}"
             IsVisible="{Binding FoldersEnabled}"
             IsEnabled="{Binding IsInFolder}">
-            <ui:FontIcon
-                Margin="0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                FontFamily="avares://FluentAvalonia/Fonts#Symbols"
-                Glyph="{helpers:GlyphValueConverter Back}" />
+            <ui:SymbolIcon Symbol="Back" />
         </Button>
         <Button
             Width="40"

From 0461f9a1da609bc5e6ce383179626600d636a235 Mon Sep 17 00:00:00 2001
From: Luke44565 <luke.j.levine@gmail.com>
Date: Sun, 24 Mar 2024 10:37:19 -0400
Subject: [PATCH 10/10] fix locales

---
 src/Ryujinx/Assets/Locales/de_DE.json | 1 -
 src/Ryujinx/Assets/Locales/el_GR.json | 1 -
 src/Ryujinx/Assets/Locales/es_ES.json | 1 -
 src/Ryujinx/Assets/Locales/fr_FR.json | 1 -
 src/Ryujinx/Assets/Locales/he_IL.json | 1 -
 src/Ryujinx/Assets/Locales/it_IT.json | 1 -
 src/Ryujinx/Assets/Locales/ja_JP.json | 1 -
 src/Ryujinx/Assets/Locales/ko_KR.json | 1 -
 src/Ryujinx/Assets/Locales/pl_PL.json | 1 -
 src/Ryujinx/Assets/Locales/pt_BR.json | 1 -
 src/Ryujinx/Assets/Locales/ru_RU.json | 1 -
 src/Ryujinx/Assets/Locales/tr_TR.json | 1 -
 src/Ryujinx/Assets/Locales/uk_UA.json | 1 -
 src/Ryujinx/Assets/Locales/zh_CN.json | 1 -
 src/Ryujinx/Assets/Locales/zh_TW.json | 1 -
 15 files changed, 15 deletions(-)

diff --git a/src/Ryujinx/Assets/Locales/de_DE.json b/src/Ryujinx/Assets/Locales/de_DE.json
index 796622cf86..7cdcdf5a2a 100644
--- a/src/Ryujinx/Assets/Locales/de_DE.json
+++ b/src/Ryujinx/Assets/Locales/de_DE.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Oberfläche",
   "SettingsTabGeneralGeneral": "Allgemein",
   "SettingsTabGeneralEnableDiscordRichPresence": "Aktiviere die Statusanzeige für Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Beim Start nach Updates suchen",
   "SettingsTabGeneralShowConfirmExitDialog": "Zeige den \"Beenden bestätigen\"-Dialog",
   "SettingsTabGeneralHideCursor": "Mauszeiger ausblenden",
diff --git a/src/Ryujinx/Assets/Locales/el_GR.json b/src/Ryujinx/Assets/Locales/el_GR.json
index b55e53fb55..59f50ad923 100644
--- a/src/Ryujinx/Assets/Locales/el_GR.json
+++ b/src/Ryujinx/Assets/Locales/el_GR.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Εμφάνιση",
   "SettingsTabGeneralGeneral": "Γενικά",
   "SettingsTabGeneralEnableDiscordRichPresence": "Ενεργοποίηση Εμπλουτισμένης Παρουσίας Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Έλεγχος για Ενημερώσεις στην Εκκίνηση",
   "SettingsTabGeneralShowConfirmExitDialog": "Εμφάνιση διαλόγου \"Επιβεβαίωση Εξόδου\".",
   "SettingsTabGeneralHideCursor": "Απόκρυψη Κέρσορα:",
diff --git a/src/Ryujinx/Assets/Locales/es_ES.json b/src/Ryujinx/Assets/Locales/es_ES.json
index d92a803fa5..91bcd8f114 100644
--- a/src/Ryujinx/Assets/Locales/es_ES.json
+++ b/src/Ryujinx/Assets/Locales/es_ES.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Interfaz de usuario",
   "SettingsTabGeneralGeneral": "General",
   "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar estado en Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Buscar actualizaciones al iniciar",
   "SettingsTabGeneralShowConfirmExitDialog": "Mostrar diálogo de confirmación al cerrar",
   "SettingsTabGeneralHideCursor": "Esconder el cursor:",
diff --git a/src/Ryujinx/Assets/Locales/fr_FR.json b/src/Ryujinx/Assets/Locales/fr_FR.json
index 550322309b..5bab6f7b2c 100644
--- a/src/Ryujinx/Assets/Locales/fr_FR.json
+++ b/src/Ryujinx/Assets/Locales/fr_FR.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Interface Utilisateur",
   "SettingsTabGeneralGeneral": "Général",
   "SettingsTabGeneralEnableDiscordRichPresence": "Activer Discord Rich Presence",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Vérifier les mises à jour au démarrage",
   "SettingsTabGeneralShowConfirmExitDialog": "Afficher le message de \"Confirmation de sortie\"",
   "SettingsTabGeneralHideCursor": "Masquer le Curseur :",
diff --git a/src/Ryujinx/Assets/Locales/he_IL.json b/src/Ryujinx/Assets/Locales/he_IL.json
index 7d4b67a5c0..e5caf445a7 100644
--- a/src/Ryujinx/Assets/Locales/he_IL.json
+++ b/src/Ryujinx/Assets/Locales/he_IL.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "ממשק משתמש",
   "SettingsTabGeneralGeneral": "כללי",
   "SettingsTabGeneralEnableDiscordRichPresence": "הפעלת תצוגה עשירה בדיסקורד",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "בדוק אם קיימים עדכונים בהפעלה",
   "SettingsTabGeneralShowConfirmExitDialog": "הראה דיאלוג \"אשר יציאה\"",
   "SettingsTabGeneralHideCursor": "הסתר את הסמן",
diff --git a/src/Ryujinx/Assets/Locales/it_IT.json b/src/Ryujinx/Assets/Locales/it_IT.json
index 56b492b9d1..5aff7a7ec3 100644
--- a/src/Ryujinx/Assets/Locales/it_IT.json
+++ b/src/Ryujinx/Assets/Locales/it_IT.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Interfaccia utente",
   "SettingsTabGeneralGeneral": "Generali",
   "SettingsTabGeneralEnableDiscordRichPresence": "Attiva Discord Rich Presence",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Controlla aggiornamenti all'avvio",
   "SettingsTabGeneralShowConfirmExitDialog": "Mostra dialogo \"Conferma Uscita\"",
   "SettingsTabGeneralHideCursor": "Nascondi il cursore:",
diff --git a/src/Ryujinx/Assets/Locales/ja_JP.json b/src/Ryujinx/Assets/Locales/ja_JP.json
index 040bf433a7..5b31c5f206 100644
--- a/src/Ryujinx/Assets/Locales/ja_JP.json
+++ b/src/Ryujinx/Assets/Locales/ja_JP.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "ユーザインタフェース",
   "SettingsTabGeneralGeneral": "一般",
   "SettingsTabGeneralEnableDiscordRichPresence": "Discord リッチプレゼンスを有効にする",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "起動時にアップデートを確認する",
   "SettingsTabGeneralShowConfirmExitDialog": "\"終了を確認\" ダイアログを表示する",
   "SettingsTabGeneralHideCursor": "マウスカーソルを非表示",
diff --git a/src/Ryujinx/Assets/Locales/ko_KR.json b/src/Ryujinx/Assets/Locales/ko_KR.json
index 35b2eee7ca..cdc6172224 100644
--- a/src/Ryujinx/Assets/Locales/ko_KR.json
+++ b/src/Ryujinx/Assets/Locales/ko_KR.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "사용자 인터페이스",
   "SettingsTabGeneralGeneral": "일반",
   "SettingsTabGeneralEnableDiscordRichPresence": "디스코드 활동 상태 활성화",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "시작 시, 업데이트 확인",
   "SettingsTabGeneralShowConfirmExitDialog": "\"종료 확인\" 대화 상자 표시",
   "SettingsTabGeneralHideCursor": "마우스 커서 숨기기",
diff --git a/src/Ryujinx/Assets/Locales/pl_PL.json b/src/Ryujinx/Assets/Locales/pl_PL.json
index 5af410a8c3..7edf41e845 100644
--- a/src/Ryujinx/Assets/Locales/pl_PL.json
+++ b/src/Ryujinx/Assets/Locales/pl_PL.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Interfejs Użytkownika",
   "SettingsTabGeneralGeneral": "Ogólne",
   "SettingsTabGeneralEnableDiscordRichPresence": "Włącz Bogatą Obecność Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Sprawdź Aktualizacje przy Uruchomieniu",
   "SettingsTabGeneralShowConfirmExitDialog": "Pokaż Okno Dialogowe \"Potwierdzenia Wyjścia\"",
   "SettingsTabGeneralHideCursor": "Ukryj kursor:",
diff --git a/src/Ryujinx/Assets/Locales/pt_BR.json b/src/Ryujinx/Assets/Locales/pt_BR.json
index 5959ae4153..8909a84fec 100644
--- a/src/Ryujinx/Assets/Locales/pt_BR.json
+++ b/src/Ryujinx/Assets/Locales/pt_BR.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Geral",
   "SettingsTabGeneralGeneral": "Geral",
   "SettingsTabGeneralEnableDiscordRichPresence": "Habilitar Rich Presence do Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Verificar se há atualizações ao iniciar",
   "SettingsTabGeneralShowConfirmExitDialog": "Exibir diálogo de confirmação ao sair",
   "SettingsTabGeneralHideCursor": "Esconder o cursor do mouse:",
diff --git a/src/Ryujinx/Assets/Locales/ru_RU.json b/src/Ryujinx/Assets/Locales/ru_RU.json
index bfa87514eb..a2128e52e5 100644
--- a/src/Ryujinx/Assets/Locales/ru_RU.json
+++ b/src/Ryujinx/Assets/Locales/ru_RU.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Пользовательский интерфейс",
   "SettingsTabGeneralGeneral": "Общее",
   "SettingsTabGeneralEnableDiscordRichPresence": "Включить Discord Rich Presence",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Проверять наличие обновлений при запуске",
   "SettingsTabGeneralShowConfirmExitDialog": "Показать диалоговое окно \"Подтвердить выход\"",
   "SettingsTabGeneralHideCursor": "Скрыть курсор",
diff --git a/src/Ryujinx/Assets/Locales/tr_TR.json b/src/Ryujinx/Assets/Locales/tr_TR.json
index 14e9880285..3f70a781d6 100644
--- a/src/Ryujinx/Assets/Locales/tr_TR.json
+++ b/src/Ryujinx/Assets/Locales/tr_TR.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Kullancı Arayüzü",
   "SettingsTabGeneralGeneral": "Genel",
   "SettingsTabGeneralEnableDiscordRichPresence": "Discord Zengin İçerik'i Etkinleştir",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Her Açılışta Güncellemeleri Denetle",
   "SettingsTabGeneralShowConfirmExitDialog": "\"Çıkışı Onayla\" Diyaloğunu Göster",
   "SettingsTabGeneralHideCursor": "İşaretçiyi Gizle:",
diff --git a/src/Ryujinx/Assets/Locales/uk_UA.json b/src/Ryujinx/Assets/Locales/uk_UA.json
index 2eb3509993..a119fb4b71 100644
--- a/src/Ryujinx/Assets/Locales/uk_UA.json
+++ b/src/Ryujinx/Assets/Locales/uk_UA.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "Інтерфейс користувача",
   "SettingsTabGeneralGeneral": "Загальні",
   "SettingsTabGeneralEnableDiscordRichPresence": "Увімкнути розширену присутність Discord",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Перевіряти наявність оновлень під час запуску",
   "SettingsTabGeneralShowConfirmExitDialog": "Показати діалогове вікно «Підтвердити вихід».",
   "SettingsTabGeneralHideCursor": "Hide Cursor:",
diff --git a/src/Ryujinx/Assets/Locales/zh_CN.json b/src/Ryujinx/Assets/Locales/zh_CN.json
index 7c42adba5a..d09a80ec6e 100644
--- a/src/Ryujinx/Assets/Locales/zh_CN.json
+++ b/src/Ryujinx/Assets/Locales/zh_CN.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "用户界面",
   "SettingsTabGeneralGeneral": "常规",
   "SettingsTabGeneralEnableDiscordRichPresence": "启用 Discord 在线状态展示",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "自动检查更新",
   "SettingsTabGeneralShowConfirmExitDialog": "显示 \"确认退出\" 对话框",
   "SettingsTabGeneralHideCursor": "隐藏鼠标指针：",
diff --git a/src/Ryujinx/Assets/Locales/zh_TW.json b/src/Ryujinx/Assets/Locales/zh_TW.json
index 4afeea5316..a2f59f60dd 100644
--- a/src/Ryujinx/Assets/Locales/zh_TW.json
+++ b/src/Ryujinx/Assets/Locales/zh_TW.json
@@ -85,7 +85,6 @@
   "SettingsTabGeneral": "使用者介面",
   "SettingsTabGeneralGeneral": "一般",
   "SettingsTabGeneralEnableDiscordRichPresence": "啟用 Discord 動態狀態展示",
-  "SettingsTabGeneralUseSystemGameFolders": "Show Folders",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "自動檢查更新",
   "SettingsTabGeneralShowConfirmExitDialog": "顯示「確認離開」對話框",
   "SettingsTabGeneralHideCursor": "隱藏滑鼠遊標：",