Merge e36f6527b7 into 57c22a1f32

Moved the Views that existed in the Controls namespace into the Ryujinx.Ava.UI.Views.Misc namespace
Moved UpdateWaitWindow to Ryujinx.Ava.UI.Windows

src/Ryujinx.Graphics.GAL/IRenderer.cs

@@ -1,4 +1,6 @@
 using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.GAL.Multithreading;
 using System;
 using System.Threading;
 
@@ -10,6 +12,20 @@ namespace Ryujinx.Graphics.GAL
 
         bool PreferThreading { get; }
 
+        public IRenderer TryMakeThreaded(BackendThreading backendThreading = BackendThreading.Auto)
+        {
+            if (backendThreading is BackendThreading.On ||
+                (backendThreading is BackendThreading.Auto && PreferThreading))
+            {
+                Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): True");
+                return new ThreadedRenderer(this);
+            }
+            
+            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({backendThreading}): False");
+
+            return this;
+        }
+
         IPipeline Pipeline { get; }
 
         IWindow Window { get; }

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnMitm/LdnMitmClient.cs

@@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnMitm
 
         private readonly LanDiscovery _lanDiscovery;
 
-        public LdnMitmClient(HLEConfiguration config)
+        public LdnMitmClient(HleConfiguration config)
         {
             UnicastIPAddressInformation localIpInterface = NetworkHelpers.GetLocalInterface(config.MultiplayerLanInterfaceId).Item2;
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/LdnMasterProxyClient.cs

@@ -51,13 +51,13 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu
         private string _passphrase;
         private byte[] _gameVersion = new byte[0x10];
 
-        private readonly HLEConfiguration _config;
+        private readonly HleConfiguration _config;
 
         public event EventHandler<NetworkChangeEventArgs> NetworkChange;
 
         public ProxyConfig Config { get; private set; }
 
-        public LdnMasterProxyClient(string address, int port, HLEConfiguration config) : base(address, port)
+        public LdnMasterProxyClient(string address, int port, HleConfiguration config) : base(address, port)
         {
             if (ProxyHelpers.SupportsNoDelay())
             {

src/Ryujinx.HLE/HleConfiguration.cs

@@ -15,55 +15,55 @@ namespace Ryujinx.HLE
     /// <summary>
     /// HLE configuration.
     /// </summary>
-    public class HLEConfiguration
+    public class HleConfiguration
     {
         /// <summary>
         /// The virtual file system used by the FS service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly VirtualFileSystem VirtualFileSystem;
+        internal VirtualFileSystem VirtualFileSystem { get; private set; }
 
         /// <summary>
         /// The manager for handling a LibHac Horizon instance.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly LibHacHorizonManager LibHacHorizonManager;
+        internal LibHacHorizonManager LibHacHorizonManager { get; private set; }
 
         /// <summary>
         /// The account manager used by the account service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly AccountManager AccountManager;
+        internal AccountManager AccountManager { get; private set; }
 
         /// <summary>
         /// The content manager used by the NCM service.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly ContentManager ContentManager;
+        internal ContentManager ContentManager { get; private set; }
 
         /// <summary>
         /// The persistent information between run for multi-application capabilities.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        public readonly UserChannelPersistence UserChannelPersistence;
+        public UserChannelPersistence UserChannelPersistence { get; private set; }
 
         /// <summary>
         /// The GPU renderer to use for all GPU operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IRenderer GpuRenderer;
+        internal IRenderer GpuRenderer { get; private set; }
 
         /// <summary>
         /// The audio device driver to use for all audio operations.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IHardwareDeviceDriver AudioDeviceDriver;
+        internal IHardwareDeviceDriver AudioDeviceDriver { get; private set; }
 
         /// <summary>
         /// The handler for various UI related operations needed outside of HLE.
         /// </summary>
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
-        internal readonly IHostUIHandler HostUIHandler;
+        internal IHostUIHandler HostUIHandler { get; private set; }
 
         /// <summary>
         /// Control the memory configuration used by the emulation context.
@@ -195,15 +195,7 @@ namespace Ryujinx.HLE
         /// <remarks>This cannot be changed after <see cref="Switch"/> instantiation.</remarks>
         public EnabledDirtyHack[] Hacks { internal get; set; }
 
-        public HLEConfiguration(VirtualFileSystem virtualFileSystem,
-                                LibHacHorizonManager libHacHorizonManager,
-                                ContentManager contentManager,
-                                AccountManager accountManager,
-                                UserChannelPersistence userChannelPersistence,
-                                IRenderer gpuRenderer,
-                                IHardwareDeviceDriver audioDeviceDriver,
-                                MemoryConfiguration memoryConfiguration,
-                                IHostUIHandler hostUIHandler,
+        public HleConfiguration(MemoryConfiguration memoryConfiguration,
                                 SystemLanguage systemLanguage,
                                 RegionCode region,
                                 VSyncMode vSyncMode,
@@ -227,15 +219,7 @@ namespace Ryujinx.HLE
                                 int customVSyncInterval,
                                 EnabledDirtyHack[] dirtyHacks = null)
         {
-            VirtualFileSystem = virtualFileSystem;
-            LibHacHorizonManager = libHacHorizonManager;
-            AccountManager = accountManager;
-            ContentManager = contentManager;
-            UserChannelPersistence = userChannelPersistence;
-            GpuRenderer = gpuRenderer;
-            AudioDeviceDriver = audioDeviceDriver;
             MemoryConfiguration = memoryConfiguration;
-            HostUIHandler = hostUIHandler;
             SystemLanguage = systemLanguage;
             Region = region;
             VSyncMode = vSyncMode;
@@ -259,5 +243,30 @@ namespace Ryujinx.HLE
             MultiplayerLdnServer = multiplayerLdnServer;
             Hacks = dirtyHacks ?? [];
         }
+
+        /// <summary>
+        /// Set the pre-configured services to use for this <see cref="HleConfiguration"/> instance.
+        /// </summary>
+        public HleConfiguration Configure(
+            VirtualFileSystem virtualFileSystem,
+            LibHacHorizonManager libHacHorizonManager,
+            ContentManager contentManager,
+            AccountManager accountManager,
+            UserChannelPersistence userChannelPersistence,
+            IRenderer gpuRenderer,
+            IHardwareDeviceDriver audioDeviceDriver,
+            IHostUIHandler hostUIHandler
+        )
+        {
+            VirtualFileSystem = virtualFileSystem;
+            LibHacHorizonManager = libHacHorizonManager;
+            AccountManager = accountManager;
+            ContentManager = contentManager;
+            UserChannelPersistence = userChannelPersistence;
+            GpuRenderer = gpuRenderer;
+            AudioDeviceDriver = audioDeviceDriver;
+            HostUIHandler = hostUIHandler;
+            return this;
+        }
     }
 }

src/Ryujinx.HLE/Switch.cs

@@ -20,7 +20,7 @@ namespace Ryujinx.HLE
     {
         public static Switch Shared { get; private set; }
         
-        public HLEConfiguration Configuration { get; }
+        public HleConfiguration Configuration { get; }
         public IHardwareDeviceDriver AudioDeviceDriver { get; }
         public MemoryBlock Memory { get; }
         public GpuContext Gpu { get; }
@@ -44,7 +44,7 @@ namespace Ryujinx.HLE
 
         public DirtyHacks DirtyHacks { get; }
 
-        public Switch(HLEConfiguration configuration)
+        public Switch(HleConfiguration configuration)
         {
             ArgumentNullException.ThrowIfNull(configuration.GpuRenderer);
             ArgumentNullException.ThrowIfNull(configuration.AudioDeviceDriver);
@@ -94,16 +94,20 @@ namespace Ryujinx.HLE
             Gpu.GPFifo.DispatchCalls();
         }
 
-        public void IncrementCustomVSyncInterval()
+        public int IncrementCustomVSyncInterval()
         {
             CustomVSyncInterval += 1;
             UpdateVSyncInterval();
+
+            return CustomVSyncInterval;
         }
 
-        public void DecrementCustomVSyncInterval()
+        public int DecrementCustomVSyncInterval()
         {
             CustomVSyncInterval -= 1;
             UpdateVSyncInterval();
+
+            return CustomVSyncInterval;
         }
 
         public void UpdateVSyncInterval()

src/Ryujinx/AppHost.cs

@@ -902,53 +902,19 @@ namespace Ryujinx.Ava
                 _ => new OpenGLRenderer()
             };
 
-            BackendThreading threadingMode = ConfigurationState.Instance.Graphics.BackendThreading;
-
-            bool isGALThreaded = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
-            if (isGALThreaded)
-            {
-                renderer = new ThreadedRenderer(renderer);
-            }
-
-            Logger.Info?.PrintMsg(LogClass.Gpu, $"Backend Threading ({threadingMode}): {isGALThreaded}");
-
             // Initialize Configuration.
-            MemoryConfiguration memoryConfiguration = ConfigurationState.Instance.System.DramSize.Value;
-
-            Device = new Switch(new HLEConfiguration(
-                VirtualFileSystem,
-                _viewModel.LibHacHorizonManager,
-                ContentManager,
-                _accountManager,
-                _userChannelPersistence,
-                renderer,
-                InitializeAudio(),
-                memoryConfiguration,
-                _viewModel.UiHandler,
-                (SystemLanguage)ConfigurationState.Instance.System.Language.Value,
-                (RegionCode)ConfigurationState.Instance.System.Region.Value,
-                ConfigurationState.Instance.Graphics.VSyncMode,
-                ConfigurationState.Instance.System.EnableDockedMode,
-                ConfigurationState.Instance.System.EnablePtc,
-                ConfigurationState.Instance.System.EnableInternetAccess,
-                ConfigurationState.Instance.System.EnableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                ConfigurationState.Instance.System.FsGlobalAccessLogMode,
-                ConfigurationState.Instance.System.MatchSystemTime 
-                    ? 0 
-                    : ConfigurationState.Instance.System.SystemTimeOffset,
-                ConfigurationState.Instance.System.TimeZone,
-                ConfigurationState.Instance.System.MemoryManagerMode,
-                ConfigurationState.Instance.System.IgnoreMissingServices,
-                ConfigurationState.Instance.Graphics.AspectRatio,
-                ConfigurationState.Instance.System.AudioVolume,
-                ConfigurationState.Instance.System.UseHypervisor,
-                ConfigurationState.Instance.Multiplayer.LanInterfaceId.Value,
-                ConfigurationState.Instance.Multiplayer.Mode,
-                ConfigurationState.Instance.Multiplayer.DisableP2p,
-                ConfigurationState.Instance.Multiplayer.LdnPassphrase,
-                ConfigurationState.Instance.Multiplayer.GetLdnServer(),
-                ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value,
-                ConfigurationState.Instance.Hacks.ShowDirtyHacks ? ConfigurationState.Instance.Hacks.EnabledHacks : null));
+            Device = new Switch(ConfigurationState.Instance.CreateHleConfiguration()
+                .Configure(
+                    VirtualFileSystem,
+                    _viewModel.LibHacHorizonManager,
+                    ContentManager,
+                    _accountManager,
+                    _userChannelPersistence,
+                    renderer.TryMakeThreaded(ConfigurationState.Instance.Graphics.BackendThreading),
+                    InitializeAudio(),
+                    _viewModel.UiHandler
+                )
+            );
         }
 
         private static IHardwareDeviceDriver InitializeAudio()
@@ -1182,6 +1148,9 @@ namespace Ryujinx.Ava
 
         private void UpdateShaderCount()
         {
+            if (_displayCount is 0 && _renderer.ProgramCount is 0)
+                return;
+            
             // If there is a mismatch between total program compile and previous count
             // this means new shaders have been compiled and should be displayed.
             if (_renderer.ProgramCount != _previousCount)
@@ -1255,12 +1224,10 @@ namespace Ryujinx.Ava
                             VSyncModeToggle();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalDecrement:
-                            Device.DecrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval -= 1;
+                            _viewModel.CustomVSyncInterval = Device.DecrementCustomVSyncInterval();
                             break;
                         case KeyboardHotkeyState.CustomVSyncIntervalIncrement:
-                            Device.IncrementCustomVSyncInterval();
-                            _viewModel.CustomVSyncInterval += 1;
+                            _viewModel.CustomVSyncInterval = Device.IncrementCustomVSyncInterval();
                             break;
                         case KeyboardHotkeyState.Screenshot:
                             ScreenshotRequested = true;

src/Ryujinx/Assets/locales.json

@@ -469,7 +469,7 @@
         "tr_TR": "",
         "uk_UA": "Відкрити теку скріншотів",
         "zh_CN": "打开截图文件夹",
-        "zh_TW": ""
+        "zh_TW": "開啟螢幕擷取畫面資料夾"
       }
     },
     {
@@ -619,7 +619,7 @@
         "tr_TR": "",
         "uk_UA": "Запускати ігри з прихованим інтерфейсом",
         "zh_CN": "启动游戏时隐藏 UI",
-        "zh_TW": ""
+        "zh_TW": "開啟遊戲時隱藏 UI"
       }
     },
     {
@@ -1569,7 +1569,7 @@
         "tr_TR": "",
         "uk_UA": "Розроблено: {0}",
         "zh_CN": "由 {0} 开发",
-        "zh_TW": ""
+        "zh_TW": "由 {0} 開發"
       }
     },
     {
@@ -1869,7 +1869,7 @@
         "tr_TR": "",
         "uk_UA": "Сумісність:",
         "zh_CN": "兼容性:",
-        "zh_TW": ""
+        "zh_TW": "相容性:"
       }
     },
     {
@@ -1894,7 +1894,7 @@
         "tr_TR": "",
         "uk_UA": "ID гри:",
         "zh_CN": "标题 ID:",
-        "zh_TW": ""
+        "zh_TW": "標題 ID:"
       }
     },
     {
@@ -1919,7 +1919,7 @@
         "tr_TR": "",
         "uk_UA": "Розміщені ігри: {0}",
         "zh_CN": "服务的游戏: {0}",
-        "zh_TW": ""
+        "zh_TW": "LDN 上主持的遊戲數量: {0}"
       }
     },
     {
@@ -1944,7 +1944,7 @@
         "tr_TR": "",
         "uk_UA": "Гравців онлайн: {0}",
         "zh_CN": "在线玩家: {0}",
-        "zh_TW": ""
+        "zh_TW": "LDN 上在線的玩家數量: {0}"
       }
     },
     {
@@ -2294,7 +2294,7 @@
         "tr_TR": "",
         "uk_UA": "Очистити кеш PPTC",
         "zh_CN": "清理 PPTC 缓存",
-        "zh_TW": ""
+        "zh_TW": "清除 PPTC"
       }
     },
     {
@@ -2319,7 +2319,7 @@
         "tr_TR": "",
         "uk_UA": "Видаляє всі файли кешу PPTC для застосунку",
         "zh_CN": "删除应用程序的所有 PPTC 缓存",
-        "zh_TW": ""
+        "zh_TW": "清除應用程式的 PPTC"
       }
     },
     {
@@ -2369,7 +2369,7 @@
         "tr_TR": "Uygulamanın shader önbelleğini temizler",
         "uk_UA": "Видаляє кеш шейдерів застосунку (гри)",
         "zh_CN": "删除游戏的着色器缓存文件，下次启动游戏时重新生成着色器缓存文件",
-        "zh_TW": "刪除應用程式的著色器快取"
+        "zh_TW": "清除應用程式的著色器快取檔案"
       }
     },
     {
@@ -2644,7 +2644,7 @@
         "tr_TR": "",
         "uk_UA": "Витягти RomFS з обраного файлу DLC",
         "zh_CN": "从选定的 DLC 文件中解压 RomFS",
-        "zh_TW": ""
+        "zh_TW": "從已選擇的 DLC 檔案中提取 RomFS"
       }
     },
     {
@@ -2769,7 +2769,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "建立遊戲獨立自訂 (per-game) 設定檔"
       }
     },
     {
@@ -2794,7 +2794,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "編輯遊戲獨立自訂 (per-game) 設定檔"
       }
     },
     {
@@ -2844,7 +2844,7 @@
         "tr_TR": "Mevcut oyun için bağımsız bir yapılandırma oluşturur",
         "uk_UA": "Створює незалежну конфігурацію для поточної гри",
         "zh_CN": "为当前游戏创建独立的配置",
-        "zh_TW": "為當前遊戲創建獨立的配置"
+        "zh_TW": "為已選擇的遊戲建立遊戲獨立自訂 (game-specific) 的設定檔"
       }
     },
     {
@@ -2869,7 +2869,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "為已選擇的遊戲編輯遊戲獨立自訂 (game-specific) 的設定檔"
       }
     },
     {
@@ -2894,7 +2894,7 @@
         "tr_TR": "",
         "uk_UA": "Iнформація про сумісність",
         "zh_CN": "显示兼容性项目",
-        "zh_TW": ""
+        "zh_TW": "顯示相容性資訊"
       }
     },
     {
@@ -2919,7 +2919,7 @@
         "tr_TR": "",
         "uk_UA": "Показати цю гру в Списку Сумісності. Список сумісності також можна зайти в меню Довідки.",
         "zh_CN": "在兼容性列表中显示选定的游戏,您通常可以通过帮助菜单访问。",
-        "zh_TW": ""
+        "zh_TW": "在相容性列表中顯示已選擇的遊戲。你也可以透過「說明」選單開啟。"
       }
     },
     {
@@ -2944,7 +2944,7 @@
         "tr_TR": "",
         "uk_UA": "Інформація про гру",
         "zh_CN": "显示游戏信息",
-        "zh_TW": ""
+        "zh_TW": "顯示遊戲資訊"
       }
     },
     {
@@ -2969,7 +2969,7 @@
         "tr_TR": "",
         "uk_UA": "Показати статистику та деталі обраної гри.",
         "zh_CN": "显示当前选定游戏的状态与详细信息。",
-        "zh_TW": ""
+        "zh_TW": "顯示目前已選擇遊戲的狀態及詳細資訊。"
       }
     },
     {
@@ -3519,7 +3519,7 @@
         "tr_TR": "",
         "uk_UA": "Перевірка оновлень:",
         "zh_CN": "检查更新",
-        "zh_TW": ""
+        "zh_TW": "檢查更新:"
       }
     },
     {
@@ -3544,7 +3544,7 @@
         "tr_TR": "",
         "uk_UA": "Вимкнути",
         "zh_CN": "关闭",
-        "zh_TW": ""
+        "zh_TW": "關閉"
       }
     },
     {
@@ -3569,7 +3569,7 @@
         "tr_TR": "",
         "uk_UA": "Запитувати щоразу",
         "zh_CN": "提示",
-        "zh_TW": ""
+        "zh_TW": "提示"
       }
     },
     {
@@ -3594,7 +3594,7 @@
         "tr_TR": "",
         "uk_UA": "Оновлювати в фоні",
         "zh_CN": "背景",
-        "zh_TW": ""
+        "zh_TW": "背景"
       }
     },
     {
@@ -3619,7 +3619,7 @@
         "tr_TR": "",
         "uk_UA": "При втраті фокуса емулятором:",
         "zh_CN": "当模拟器在后台时：",
-        "zh_TW": ""
+        "zh_TW": "當模擬器「失去焦點」(如切換工作)時:"
       }
     },
     {
@@ -3644,7 +3644,7 @@
         "tr_TR": "",
         "uk_UA": "Нічого не робити",
         "zh_CN": "什么事情也不做",
-        "zh_TW": ""
+        "zh_TW": "沒有動作"
       }
     },
     {
@@ -3669,7 +3669,7 @@
         "tr_TR": "",
         "uk_UA": "Блокувати введення",
         "zh_CN": "禁用输入",
-        "zh_TW": ""
+        "zh_TW": "停用輸入"
       }
     },
     {
@@ -3694,7 +3694,7 @@
         "tr_TR": "",
         "uk_UA": "Вимкнути звук",
         "zh_CN": "静音",
-        "zh_TW": ""
+        "zh_TW": "靜音"
       }
     },
     {
@@ -3719,7 +3719,7 @@
         "tr_TR": "",
         "uk_UA": "Блокувати введення та Вимкнути звук",
         "zh_CN": "阻止输入且静音",
-        "zh_TW": ""
+        "zh_TW": "停用輸入且靜音"
       }
     },
     {
@@ -3744,7 +3744,7 @@
         "tr_TR": "",
         "uk_UA": "Поставити на паузу",
         "zh_CN": "暂停模拟",
-        "zh_TW": ""
+        "zh_TW": "暫停模擬"
       }
     },
     {
@@ -3819,7 +3819,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "在后台时禁用输入",
-        "zh_TW": ""
+        "zh_TW": "在「失去焦點」時停用輸入"
       }
     },
     {
@@ -4844,7 +4844,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "与系统时间同步",
-        "zh_TW": ""
+        "zh_TW": "與系統時間同步"
       }
     },
     {
@@ -5269,7 +5269,7 @@
         "tr_TR": "",
         "uk_UA": "Ігнорувати Аплет Контролера",
         "zh_CN": "忽略控制器小程序",
-        "zh_TW": ""
+        "zh_TW": "忽略控制器小程式"
       }
     },
     {
@@ -6119,7 +6119,7 @@
         "tr_TR": "",
         "uk_UA": "Увімкнути журнали інтерфейсу",
         "zh_CN": "启用 UI 日志",
-        "zh_TW": ""
+        "zh_TW": "啟用 UI 日誌"
       }
     },
     {
@@ -6519,7 +6519,7 @@
         "tr_TR": "",
         "uk_UA": "Скинути налаштування",
         "zh_CN": "重置设置",
-        "zh_TW": ""
+        "zh_TW": "重設設定"
       }
     },
     {
@@ -6544,7 +6544,7 @@
         "tr_TR": "",
         "uk_UA": "Я хочу скинути налаштування.",
         "zh_CN": "我要重置我的设置。",
-        "zh_TW": ""
+        "zh_TW": "我想重設我的設定。"
       }
     },
     {
@@ -8469,7 +8469,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "关闭",
-        "zh_TW": ""
+        "zh_TW": "關閉"
       }
     },
     {
@@ -8494,7 +8494,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "彩虹",
-        "zh_TW": ""
+        "zh_TW": "彩虹"
       }
     },
     {
@@ -8519,7 +8519,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "彩虹滚动速度",
-        "zh_TW": ""
+        "zh_TW": "彩虹滾動速度"
       }
     },
     {
@@ -8544,7 +8544,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "颜色",
-        "zh_TW": ""
+        "zh_TW": "顏色"
       }
     },
     {
@@ -13819,7 +13819,7 @@
         "tr_TR": "",
         "uk_UA": "Ви збираєтесь видалити всі дані PPTC з:\n\n{0}\n\nБажаєте продовжити цю операцію?",
         "zh_CN": "您正要清理 PPTC 数据:\n\n{0}\n\n您确实要继续吗?",
-        "zh_TW": ""
+        "zh_TW": "您將要刪除以下遊戲的 PPTC:\n\n{0}\n\n您確定要繼續嗎?"
       }
     },
     {
@@ -16669,7 +16669,7 @@
         "tr_TR": "",
         "uk_UA": "Діалогове вікно Аплету Контролера не з'явиться, якщо геймпад було відключено під час роботи програми.\n\nЗалиште вимкненим якщо не впевнені.",
         "zh_CN": "在应用程序运行时如果游戏手柄断开连接则不会显示控制器小程序对话框。\n\n如果不确定，请保持关闭状态。",
-        "zh_TW": ""
+        "zh_TW": "在模擬應用程式時如果遊戲手柄中斷連線則不會顯示控制器小程式。\n\n如果不確定，請保持關閉狀態。"
       }
     },
     {
@@ -17144,7 +17144,7 @@
         "tr_TR": "",
         "uk_UA": "Виводити повідомлення журналу Avalonia (UI) в консоль",
         "zh_CN": "在控制台显示 Avalonia (UI) 的日志信息",
-        "zh_TW": ""
+        "zh_TW": "在控制台中輸出 Avalonia (UI) 日誌訊息。"
       }
     },
     {
@@ -17344,7 +17344,7 @@
         "tr_TR": "",
         "uk_UA": "Відкрити теку куди зберігаються скріншоти Ryujinx",
         "zh_CN": "打开 Ryujinx 截图文件夹",
-        "zh_TW": ""
+        "zh_TW": "開啟 Ryujinx 螢幕擷取畫面資料夾"
       }
     },
     {
@@ -18094,7 +18094,7 @@
         "tr_TR": "",
         "uk_UA": "Доступне оновлення!",
         "zh_CN": "有可用的更新！",
-        "zh_TW": ""
+        "zh_TW": "有可用的更新！"
       }
     },
     {
@@ -19919,7 +19919,7 @@
         "tr_TR": "",
         "uk_UA": "Налаштування LED",
         "zh_CN": "LED 设置",
-        "zh_TW": ""
+        "zh_TW": "LED 設定"
       }
     },
     {
@@ -21769,7 +21769,7 @@
         "tr_TR": "Yeniden Doku Sıkıştırılmasını Aktif Et",
         "uk_UA": "Увімкнути рекомпресію текстури",
         "zh_CN": "启用纹理压缩",
-        "zh_TW": "開啟材質重新壓縮"
+        "zh_TW": "啟用材質重新壓縮"
       }
     },
     {
@@ -24069,7 +24069,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається та оптимально працює (без збоїв або графічних багів) на середньостатистичному комп'ютері.",
         "zh_CN": "启动和游戏时不会出现任何崩溃或任何类型的 GPU bug 且速度足够快可以在一般 PC 上尽情游玩。",
-        "zh_TW": ""
+        "zh_TW": "啟動和遊玩時不會出現任何崩潰或任何類型的 GPU bug 且速度足夠快可以在一般 PC 上盡情遊玩。"
       }
     },
     {
@@ -24094,7 +24094,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається, але в грі на вас чекатимуть одна або декілька наступних проблем: збої, зависання, графічні баги, спотворений звук або ж гра загалом працюватиме надто повільно. Можливо, її все ще можна пройти, але досвід буде не найкращим.",
         "zh_CN": "可以成功启动并进入游戏但可能会遇到以下一种或多种问题: 崩溃、卡死、GPU bug、令人无法接受的音频,或者只是太慢。仍然可以继续进行游戏,但是可能无法达到预期。",
-        "zh_TW": ""
+        "zh_TW": "能啟動並進入遊戲，但可能會遇到下列狀況：崩潰、卡死、GPU bug、令人無法接受的聲音、或遊戲過慢。遊戲或可繼續進行，但是可能無法達到預期效果。"
       }
     },
     {
@@ -24119,7 +24119,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається та проходить початковий екран, але пограти не вийде.",
         "zh_CN": "可以启动并通过标题画面但是无法进入到主要的游戏流程。",
-        "zh_TW": ""
+        "zh_TW": "能啟動並通過標題畫面，但是無法進入主要的遊戲畫面。"
       }
     },
     {
@@ -24144,7 +24144,7 @@
         "tr_TR": "",
         "uk_UA": "Запускається, але не відображає навіть початкового екрану.",
         "zh_CN": "可以启动但是无法通过标题画面。",
-        "zh_TW": ""
+        "zh_TW": "能啟動，但是無法通過標題畫面。"
       }
     },
     {
@@ -24169,7 +24169,7 @@
         "tr_TR": "",
         "uk_UA": "Взагалі не запускається.",
         "zh_CN": "无法启动或显示无任何动静。",
-        "zh_TW": ""
+        "zh_TW": "無法啟動"
       }
     },
     {
@@ -24194,7 +24194,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "遊戲獨立自訂 (game-specific) 設定"
       }
     },
     {
@@ -24219,7 +24219,7 @@
         "tr_TR": "",
         "uk_UA": "",
         "zh_CN": "",
-        "zh_TW": ""
+        "zh_TW": "(全域)"
       }
     },
     {
@@ -24244,7 +24244,7 @@
         "tr_TR": "",
         "uk_UA": "Оберіть DLC які бажаєте вилучити",
         "zh_CN": "选择一个要解压的 DLC",
-        "zh_TW": ""
+        "zh_TW": "選擇要提取的 DLC"
       }
     },
     {
@@ -24269,7 +24269,7 @@
         "tr_TR": "",
         "uk_UA": "Зображення картки активності Discord",
         "zh_CN": "Rich Presence 图像",
-        "zh_TW": ""
+        "zh_TW": "Rich Presence 圖像"
       }
     },
     {
@@ -24294,7 +24294,7 @@
         "tr_TR": "",
         "uk_UA": "Динамічна картка активності Discord",
         "zh_CN": "动态 Rich Presence",
-        "zh_TW": ""
+        "zh_TW": "動態 Rich Presence"
       }
     }
   ]

src/Ryujinx/Common/ApplicationHelper.cs

@@ -13,7 +13,7 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.Configuration;

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -312,49 +312,42 @@ namespace Ryujinx.Headless
             return new OpenGLRenderer();
         }
 
-        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options)
-        {
-            BackendThreading threadingMode = options.BackendThreading;
-
-            bool threadedGAL = threadingMode == BackendThreading.On || (threadingMode == BackendThreading.Auto && renderer.PreferThreading);
-
-            if (threadedGAL)
-            {
-                renderer = new ThreadedRenderer(renderer);
-            }
-
-            HLEConfiguration configuration = new(_virtualFileSystem,
-                _libHacHorizonManager,
-                _contentManager,
-                _accountManager,
-                _userChannelPersistence,
-                renderer,
-                new SDL2HardwareDeviceDriver(),
-                options.DramSize,
-                window,
-                options.SystemLanguage,
-                options.SystemRegion,
-                options.VSyncMode,
-                !options.DisableDockedMode,
-                !options.DisablePTC,
-                options.EnableInternetAccess,
-                !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
-                options.FsGlobalAccessLogMode,
-                options.SystemTimeOffset,
-                options.SystemTimeZone,
-                options.MemoryManagerMode,
-                options.IgnoreMissingServices,
-                options.AspectRatio,
-                options.AudioVolume,
-                options.UseHypervisor ?? true,
-                options.MultiplayerLanInterfaceId,
-                Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
-                false,
-                string.Empty,
-                string.Empty,
-                options.CustomVSyncInterval);
-
-            return new Switch(configuration);
-        }
+        private static Switch InitializeEmulationContext(WindowBase window, IRenderer renderer, Options options) =>
+            new(
+                new HleConfiguration(
+                        options.DramSize,
+                        options.SystemLanguage,
+                        options.SystemRegion,
+                        options.VSyncMode,
+                        !options.DisableDockedMode,
+                        !options.DisablePTC,
+                        options.EnableInternetAccess,
+                        !options.DisableFsIntegrityChecks ? IntegrityCheckLevel.ErrorOnInvalid : IntegrityCheckLevel.None,
+                        options.FsGlobalAccessLogMode,
+                        options.SystemTimeOffset,
+                        options.SystemTimeZone,
+                        options.MemoryManagerMode,
+                        options.IgnoreMissingServices,
+                        options.AspectRatio,
+                        options.AudioVolume,
+                        options.UseHypervisor ?? true,
+                        options.MultiplayerLanInterfaceId,
+                        Common.Configuration.Multiplayer.MultiplayerMode.Disabled,
+                        false,
+                        string.Empty,
+                        string.Empty,
+                        options.CustomVSyncInterval
+                    )
+                    .Configure(
+                        _virtualFileSystem,
+                        _libHacHorizonManager,
+                        _contentManager,
+                        _accountManager,
+                        _userChannelPersistence,
+                        renderer.TryMakeThreaded(options.BackendThreading),
+                        new SDL2HardwareDeviceDriver(),
+                        window
+                    )
+            );
     }
 }

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs

@@ -9,6 +9,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;

src/Ryujinx/UI/Controls/RyujinxControl.cs

@@ -9,9 +9,15 @@ namespace Ryujinx.Ava.UI.Controls
     {
         public TViewModel ViewModel
         {
-            get => (TViewModel)DataContext ?? throw new InvalidOperationException(
-                $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
-                $"Actual type is {DataContext?.GetType().AsPrettyString()}");
+            get
+            {
+                if (DataContext is not TViewModel viewModel)
+                    throw new InvalidOperationException(
+                        $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
+                        $"Actual type is {DataContext?.GetType().AsPrettyString()}");
+
+                return viewModel;
+            }
             set => DataContext = value;
         }
     }

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -4,6 +4,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
+using Avalonia.Styling;
 using Avalonia.Threading;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
@@ -21,6 +22,23 @@ namespace Ryujinx.Ava.UI.Helpers
         private static bool _isChoiceDialogOpen;
         private static ContentDialogOverlayWindow _contentDialogOverlayWindow;
 
+        public static ContentDialog ApplyStyles(
+            this ContentDialog contentDialog, 
+            double closeButtonWidth = 80, 
+            HorizontalAlignment buttonSpaceAlignment = HorizontalAlignment.Right)
+        {
+            Style closeButton = new(x => x.Name("CloseButton"));
+            closeButton.Setters.Add(new Setter(Layoutable.WidthProperty, closeButtonWidth));
+            
+            Style closeButtonParent = new(x => x.Name("CommandSpace"));
+            closeButtonParent.Setters.Add(new Setter(Layoutable.HorizontalAlignmentProperty, buttonSpaceAlignment));
+
+            contentDialog.Styles.Add(closeButton);
+            contentDialog.Styles.Add(closeButtonParent);
+
+            return contentDialog;
+        }
+
         private async static Task<UserResult> ShowContentDialog(
              string title,
              object content,
@@ -40,19 +58,19 @@ namespace Ryujinx.Ava.UI.Helpers
                 SecondaryButtonText = secondaryButton,
                 CloseButtonText = closeButton,
                 Content = content,
-                PrimaryButtonCommand = MiniCommand.Create(() =>
+                PrimaryButtonCommand = Commands.Create(() =>
                 {
                     result = primaryButtonResult;
                 })
             };
 
-            contentDialog.SecondaryButtonCommand = MiniCommand.Create(() =>
+            contentDialog.SecondaryButtonCommand = Commands.Create(() =>
             {
                 result = UserResult.No;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;
             });
 
-            contentDialog.CloseButtonCommand = MiniCommand.Create(() =>
+            contentDialog.CloseButtonCommand = Commands.Create(() =>
             {
                 result = UserResult.Cancel;
                 contentDialog.PrimaryButtonClick -= deferCloseAction;

src/Ryujinx/UI/Helpers/MiniCommand.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    public sealed class MiniCommand<T> : MiniCommand, ICommand
-    {
-        private readonly Action<T> _callback;
-        private bool _busy;
-        private readonly Func<T, Task> _asyncCallback;
-
-        public MiniCommand(Action<T> callback)
-        {
-            _callback = callback;
-        }
-
-        public MiniCommand(Func<T, Task> callback)
-        {
-            _asyncCallback = callback;
-        }
-
-        private bool Busy
-        {
-            get => _busy;
-            set
-            {
-                _busy = value;
-                CanExecuteChanged?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        public override event EventHandler CanExecuteChanged;
-        public override bool CanExecute(object parameter) => !_busy;
-
-        public override async void Execute(object parameter)
-        {
-            if (Busy)
-            {
-                return;
-            }
-            try
-            {
-                Busy = true;
-                if (_callback != null)
-                {
-                    _callback((T)parameter);
-                }
-                else
-                {
-                    await _asyncCallback((T)parameter);
-                }
-            }
-            finally
-            {
-                Busy = false;
-            }
-        }
-    }
-
-    public abstract class MiniCommand : ICommand
-    {
-        public static MiniCommand Create(Action callback) => new MiniCommand<object>(_ => callback());
-        public static MiniCommand Create<TArg>(Action<TArg> callback) => new MiniCommand<TArg>(callback);
-        public static MiniCommand CreateFromTask(Func<Task> callback) => new MiniCommand<object>(_ => callback());
-        public static MiniCommand CreateFromTask<TArg>(Func<TArg, Task> callback) => new MiniCommand<TArg>(callback);
-
-        public abstract bool CanExecute(object parameter);
-        public abstract void Execute(object parameter);
-        public abstract event EventHandler CanExecuteChanged;
-    }
-}

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     {
                         Content = $".{it.FileName}",
                         IsChecked = it.FileType.GetConfigValue(ConfigurationState.Instance.UI.ShownFileTypes),
-                        Command = MiniCommand.Create(() => Window.ToggleFileType(it.FileName))
+                        Command = Commands.Create(() => Window.ToggleFileType(it.FileName))
                     }
                 );
 
@@ -108,7 +108,7 @@ namespace Ryujinx.Ava.UI.Views.Main
                     Margin = new Thickness(3, 0, 3, 0),
                     HorizontalAlignment = HorizontalAlignment.Stretch,
                     Header = languageName,
-                    Command = MiniCommand.Create(() => MainWindowViewModel.ChangeLanguage(language))
+                    Command = Commands.Create(() => MainWindowViewModel.ChangeLanguage(language))
                 };
 
                 yield return menuItem;

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml

@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"

src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs

@@ -1,9 +1,11 @@
 using Avalonia.Controls;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
+using Avalonia.Layout;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
@@ -12,7 +14,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {
@@ -28,17 +30,7 @@ namespace Ryujinx.Ava.UI.Controls
                 Content = new ApplicationDataView { ViewModel = new ApplicationDataViewModel(appData) }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 160d));
-
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
-                Avalonia.Layout.HorizontalAlignment.Center));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles(160, HorizontalAlignment.Center));
         }
         
         public ApplicationDataView()

src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationGridView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"

src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs

@@ -1,12 +1,13 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationGridView : RyujinxControl<MainWindowViewModel>
     {

src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationListView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs

@@ -2,6 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -9,7 +10,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
     {

src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml

@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock

src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs

@@ -3,12 +3,13 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
     {
@@ -31,17 +32,7 @@ namespace Ryujinx.Ava.UI.Controls
                 Content = new DlcSelectView { ViewModel = viewModel }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
-
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty,
-                Avalonia.Layout.HorizontalAlignment.Right));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
 
             return viewModel.SelectedDlc;
         }

src/Ryujinx/UI/Windows/AboutWindow.axaml.cs

@@ -5,6 +5,7 @@ using Avalonia.Layout;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common;
@@ -14,7 +15,7 @@ using Button = Avalonia.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Windows
 {
-    public partial class AboutWindow : UserControl
+    public partial class AboutWindow : RyujinxControl<AboutWindowViewModel>
     {
         public AboutWindow()
         {
@@ -33,19 +34,10 @@ namespace Ryujinx.Ava.UI.Windows
                 PrimaryButtonText = string.Empty,
                 SecondaryButtonText = string.Empty,
                 CloseButtonText = LocaleManager.Instance[LocaleKeys.UserProfilesClose],
-                Content = new AboutWindow { DataContext = viewModel }
+                Content = new AboutWindow { ViewModel = viewModel }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
-
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, HorizontalAlignment.Right));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
         }
 
         private void Button_OnClick(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -9,6 +9,7 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:main="clr-namespace:Ryujinx.Ava.UI.Views.Main"
+    xmlns:viewsMisc="clr-namespace:Ryujinx.Ava.UI.Views.Misc"
     Cursor="{Binding Cursor}"
     Title="{Binding Title}"
     WindowState="{Binding WindowState}"
@@ -73,7 +74,7 @@
                     <main:MainViewControls
                         Name="ViewControls"
                         Grid.Row="0"/>
-                    <controls:ApplicationListView
+                    <viewsMisc:ApplicationListView
                         x:Name="ApplicationList"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
@@ -81,7 +82,7 @@
                         HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
                         IsVisible="{Binding IsList}" />
-                    <controls:ApplicationGridView
+                    <viewsMisc:ApplicationGridView
                         x:Name="ApplicationGrid"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"

src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml

@@ -1,5 +1,5 @@
 <Window
-    x:Class="Ryujinx.Ava.UI.Controls.UpdateWaitWindow"
+    x:Class="Ryujinx.Ava.UI.Windows.UpdateWaitWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml.cs

@@ -1,8 +1,7 @@
 using Avalonia.Controls;
-using Ryujinx.Ava.UI.Windows;
 using System.Threading;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Windows
 {
     public partial class UpdateWaitWindow : StyleableWindow
     {

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -25,16 +25,7 @@ namespace Ryujinx.Ava.Utilities.Compat
                 }
             };
 
-            Style closeButton = new(x => x.Name("CloseButton"));
-            closeButton.Setters.Add(new Setter(WidthProperty, 80d));
-            
-            Style closeButtonParent = new(x => x.Name("CommandSpace"));
-            closeButtonParent.Setters.Add(new Setter(HorizontalAlignmentProperty, Avalonia.Layout.HorizontalAlignment.Right));
-
-            contentDialog.Styles.Add(closeButton);
-            contentDialog.Styles.Add(closeButtonParent);
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
+            await ContentDialogHelper.ShowAsync(contentDialog.ApplyStyles());
         }
         
         public CompatibilityList()

src/Ryujinx/Utilities/Configuration/ConfigurationState.Model.cs

@@ -1,6 +1,6 @@
 using ARMeilleure;
 using Gommon;
-using Ryujinx.Ava.Utilities.AppLibrary;
+using LibHac.Tools.FsSystem;
 using Ryujinx.Ava.Utilities.Configuration.System;
 using Ryujinx.Ava.Utilities.Configuration.UI;
 using Ryujinx.Common;
@@ -11,6 +11,7 @@ using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
+using Ryujinx.HLE.HOS.SystemState;
 using System.Collections.Generic;
 using System.Linq;
 using RyuLogger = Ryujinx.Common.Logging.Logger;
@@ -19,7 +20,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 {
     public partial class ConfigurationState
     {
-                /// <summary>
+        /// <summary>
         /// UI configuration section
         /// </summary>
         public class UISection
@@ -838,5 +839,35 @@ namespace Ryujinx.Ava.Utilities.Configuration
             EnableHardwareAcceleration = new ReactiveObject<bool>();
             HideCursor = new ReactiveObject<HideCursorMode>();
         }
+
+        public HleConfiguration CreateHleConfiguration() =>
+            new(
+                System.DramSize,
+                (SystemLanguage)System.Language.Value,
+                (RegionCode)System.Region.Value,
+                Graphics.VSyncMode,
+                System.EnableDockedMode,
+                System.EnablePtc,
+                System.EnableInternetAccess,
+                System.EnableFsIntegrityChecks 
+                    ? IntegrityCheckLevel.ErrorOnInvalid 
+                    : IntegrityCheckLevel.None,
+                System.FsGlobalAccessLogMode,
+                System.MatchSystemTime
+                    ? 0
+                    : System.SystemTimeOffset,
+                System.TimeZone,
+                System.MemoryManagerMode,
+                System.IgnoreMissingServices,
+                Graphics.AspectRatio,
+                System.AudioVolume,
+                System.UseHypervisor,
+                Multiplayer.LanInterfaceId,
+                Multiplayer.Mode,
+                Multiplayer.DisableP2p,
+                Multiplayer.LdnPassphrase,
+                Instance.Multiplayer.GetLdnServer(),
+                Instance.Graphics.CustomVSyncInterval,
+                Instance.Hacks.ShowDirtyHacks ? Instance.Hacks.EnabledHacks : null);
     }
 }

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -327,5 +327,5 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             return GraphicsBackend.OpenGl;
         }
-            }
-        }
+    }
+}