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] 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 d1ca6ce6a..2af3eb344 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 b071140b8..f257dc02c 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 4fe7a5d1f..7da23648e 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 5b232af92..bd7372529 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"