From b3262302fc836f316edef3ec04c7380a875cf8ad Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 18 Apr 2024 18:24:30 -0400
Subject: [PATCH] Refactor SettingsWindow

---
 .../Views/Settings/SettingsInputView.axaml.cs |  6 ++++-
 .../Settings/SettingsSystemView.axaml.cs      |  3 ++-
 .../UI/Views/Settings/SettingsUIView.axaml.cs |  4 ++--
 src/Ryujinx/UI/Windows/SettingsWindow.axaml   | 12 ----------
 .../UI/Windows/SettingsWindow.axaml.cs        | 24 ++++++++++++++++---
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
index 55b69af06..fc88e322a 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
@@ -1,11 +1,15 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.UI.ViewModels;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
     public partial class SettingsInputView : UserControl
     {
-        public SettingsInputView()
+        public SettingsViewModel ViewModel;
+
+        public SettingsInputView(SettingsViewModel viewModel)
         {
+            ViewModel = viewModel;
             InitializeComponent();
         }
 
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
index 2c9eac28c..281d24916 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs
@@ -8,8 +8,9 @@ namespace Ryujinx.Ava.UI.Views.Settings
     {
         public SettingsViewModel ViewModel;
 
-        public SettingsSystemView()
+        public SettingsSystemView(SettingsViewModel viewModel)
         {
+            ViewModel = viewModel;
             InitializeComponent();
         }
 
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
index 996d15cdb..96e14afc5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml.cs
@@ -2,7 +2,6 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using Avalonia.VisualTree;
-using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using System.Collections.Generic;
 using System.IO;
@@ -14,8 +13,9 @@ namespace Ryujinx.Ava.UI.Views.Settings
     {
         public SettingsViewModel ViewModel;
 
-        public SettingsUiView()
+        public SettingsUiView(SettingsViewModel viewModel)
         {
+            ViewModel = viewModel;
             InitializeComponent();
         }
 
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
index ff6a4065c..b5f024295 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -8,7 +8,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:window="clr-namespace:Ryujinx.Ava.UI.Windows"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:settings="clr-namespace:Ryujinx.Ava.UI.Views.Settings"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     Width="1100"
     Height="768"
@@ -32,17 +31,6 @@
             Grid.Row="1"
             IsVisible="False"
             KeyboardNavigation.IsTabStop="False"/>
-        <Grid Name="Pages" IsVisible="False" Grid.Row="2">
-            <settings:SettingsUiView Name="UiPage" />
-            <settings:SettingsInputView Name="InputPage" />
-            <settings:SettingsHotkeysView Name="HotkeysPage" />
-            <settings:SettingsSystemView Name="SystemPage" />
-            <settings:SettingsCPUView Name="CpuPage" />
-            <settings:SettingsGraphicsView Name="GraphicsPage" />
-            <settings:SettingsAudioView Name="AudioPage" />
-            <settings:SettingsNetworkView Name="NetworkPage" />
-            <settings:SettingsLoggingView Name="LoggingPage" />
-        </Grid>
         <ui:NavigationView
             Grid.Row="1"
             IsSettingsVisible="False"
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
index ea19e492a..ff05a2401 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -3,6 +3,7 @@ using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Settings;
 using Ryujinx.HLE.FileSystem;
 using System;
 
@@ -12,6 +13,16 @@ namespace Ryujinx.Ava.UI.Windows
     {
         private SettingsViewModel ViewModel { get; }
 
+        public readonly SettingsUiView UiPage;
+        public readonly SettingsInputView InputPage;
+        public readonly SettingsHotkeysView HotkeysPage;
+        public readonly SettingsSystemView SystemPage;
+        public readonly SettingsCPUView CpuPage;
+        public readonly SettingsGraphicsView GraphicsPage;
+        public readonly SettingsAudioView AudioPage;
+        public readonly SettingsNetworkView NetworkPage;
+        public readonly  SettingsLoggingView LoggingPage;
+
         public SettingsWindow(VirtualFileSystem virtualFileSystem, ContentManager contentManager)
         {
             Title = $"{LocaleManager.Instance[LocaleKeys.Settings]}";
@@ -24,6 +35,16 @@ namespace Ryujinx.Ava.UI.Windows
             ViewModel.DirtyEvent += UpdateDirtyTitle;
             ViewModel.ToggleButtons += ToggleButtons;
 
+            UiPage = new SettingsUiView(ViewModel);
+            InputPage = new SettingsInputView(ViewModel);
+            HotkeysPage = new SettingsHotkeysView();
+            SystemPage = new SettingsSystemView(ViewModel);
+            CpuPage = new SettingsCPUView();
+            GraphicsPage = new SettingsGraphicsView();
+            AudioPage = new SettingsAudioView();
+            NetworkPage = new SettingsNetworkView();
+            LoggingPage = new SettingsLoggingView();
+
             InitializeComponent();
             Load();
         }
@@ -68,7 +89,6 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void Load()
         {
-            Pages.Children.Clear();
             NavPanel.SelectionChanged += NavPanelOnSelectionChanged;
             NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
         }
@@ -80,7 +100,6 @@ namespace Ryujinx.Ava.UI.Windows
                 switch (navItem.Tag.ToString())
                 {
                     case "UiPage":
-                        UiPage.ViewModel = ViewModel;
                         NavPanel.Content = UiPage;
                         break;
                     case "InputPage":
@@ -90,7 +109,6 @@ namespace Ryujinx.Ava.UI.Windows
                         NavPanel.Content = HotkeysPage;
                         break;
                     case "SystemPage":
-                        SystemPage.ViewModel = ViewModel;
                         NavPanel.Content = SystemPage;
                         break;
                     case "CpuPage":