Merge ae16360685 into 9c226dcc7a

hotkeys should now also be read from the global configuration file

src/Ryujinx/AppHost.cs

@@ -469,8 +469,6 @@ namespace Ryujinx.Ava
 
             _viewModel.IsGameRunning = true;
 
-           
-
             Dispatcher.UIThread.InvokeAsync(() =>
             {
                 _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);

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

@@ -13,7 +13,6 @@ using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Helper;
 using Ryujinx.HLE.HOS;
@@ -399,7 +398,6 @@ namespace Ryujinx.Ava.UI.Controls
 
                 viewModel.RefreshView();
             }
-
         }
 
         public async void OpenApplicationCompatibility_Click(object sender, RoutedEventArgs args)

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

@@ -4,7 +4,6 @@ using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Compat;
 using System;

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -7,7 +7,6 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
-using DiscordRPC;
 using DynamicData;
 using DynamicData.Binding;
 using FluentAvalonia.UI.Controls;

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -4,6 +4,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using Humanizer;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.OpenAL;
 using Ryujinx.Audio.Backends.SDL2;
@@ -384,7 +385,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public SettingsViewModel(VirtualFileSystem virtualFileSystem, ContentManager contentManager, string gamePath, string gameName, string gameId, byte[] gameIconData, bool userDirFind) : this(userDirFind)
+        public SettingsViewModel(VirtualFileSystem virtualFileSystem, 
+            ContentManager contentManager,
+            string gamePath,
+            string gameName, 
+            string gameId, 
+            byte[] gameIconData, 
+            bool enableToLoadCustomConfig) : this(enableToLoadCustomConfig)
         {
             _virtualFileSystem = virtualFileSystem;
             _contentManager = contentManager;
@@ -400,14 +407,15 @@ namespace Ryujinx.Ava.UI.ViewModels
             GameTitle = gameName;
             GameId = gameId;
 
-            if (userDirFind)
+            if (enableToLoadCustomConfig) // During the game. If there is no user config, then load the global config window
             {
                 string gameDir = Program.GetDirGameUserConfig(gameId, false, true);
                 if (ConfigurationFileFormat.TryLoad(gameDir, out ConfigurationFileFormat configurationFileFormat))
                 {
-                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);
-                    LoadCurrentConfiguration(); // Needed to load custom configuration
+                    ConfigurationState.Instance.Load(configurationFileFormat, gameDir, gameId);                 
                 }
+
+                LoadCurrentConfiguration(); // Needed to load custom configuration
             }
 
             if (Program.PreviewerDetached)
@@ -434,7 +442,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 Task.Run(LoadAvailableGpus);
 
-                if (!noLoadGlobalConfig)
+                if (!noLoadGlobalConfig)// Default is false, but loading custom config avoids double call
                 {
                     LoadCurrentConfiguration();
                 }
@@ -593,7 +601,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             DateTime currentDateTime = currentHostDateTime.Add(systemDateTimeOffset);
             CurrentDate = currentDateTime.Date;
             CurrentTime = currentDateTime.TimeOfDay;
-
             MatchSystemTime = config.System.MatchSystemTime;
 
             EnableCustomVSyncInterval = config.Graphics.EnableCustomVSyncInterval;
@@ -653,53 +660,13 @@ namespace Ryujinx.Ava.UI.ViewModels
             LdnPassphrase = config.Multiplayer.LdnPassphrase;
             LdnServer = config.Multiplayer.LdnServer;
         }
-
-        public void SaveSettings2()
-        {
-            ConfigurationState config = ConfigurationState.Instance;
-
-            // User Interface
-            config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
-            config.CheckUpdatesOnStart.Value = CheckUpdatesOnStart;
-            config.ShowConfirmExit.Value = ShowConfirmExit;
-            config.RememberWindowState.Value = RememberWindowState;
-            config.ShowTitleBar.Value = ShowTitleBar;
-            config.HideCursor.Value = (HideCursorMode)HideCursor;
-
-            if (GameDirectoryChanged)
-            {
-                config.UI.GameDirs.Value = [.. GameDirectories];
-            }
-
-            if (AutoloadDirectoryChanged)
-            {
-                config.UI.AutoloadDirs.Value = [.. AutoloadDirectories];
-            }
-
-            config.UI.BaseStyle.Value = BaseStyleIndex switch
-            {
-                0 => "Auto",
-                1 => "Light",
-                2 => "Dark",
-                _ => "Auto"
-            };
-
-            if (!string.IsNullOrEmpty(GameId))
-            {
-                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            }
-            else
-            {
-                config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
-            }
-        }
-
+     
         public void SaveSettings()
         {
             ConfigurationState config = ConfigurationState.Instance;
+            bool userConfigFile = string.IsNullOrEmpty(GameId);
 
-
-            if (string.IsNullOrEmpty(GameId))
+            if (userConfigFile)
             {
                 // User Interface
                 config.EnableDiscordIntegration.Value = EnableDiscordIntegration;
@@ -857,6 +824,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             {
                 File.Delete(gameDir);
             }
+
             RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
@@ -864,7 +832,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         public void SaveUserConfig()
         {
             SaveSettings();
-            RevertIfNotSaved();
+            RevertIfNotSaved(); // Revert global configuration after saving user configuration
             CloseWindow?.Invoke();
         }
 

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

@@ -135,7 +135,7 @@ namespace Ryujinx.Ava.UI.Views.Main
 
             Rainbow.Enable();
 
-            if (ViewModel.SelectedApplication is null)
+            if (ViewModel.SelectedApplication is null) // Checks if game data exists
             {
                 await Window.SettingsWindow.ShowDialog(Window);
             }
@@ -145,10 +145,11 @@ namespace Ryujinx.Ava.UI.Views.Main
 
                 if (!ViewModel.IsGameRunning || !userConfigExist)
                 {
-                    await Window.SettingsWindow.ShowDialog(Window);
+                    await Window.SettingsWindow.ShowDialog(Window); // The game is not running, or if the user configuration does not exist
                 }
                 else
                 {
+                    // If there is a custom configuration in the folder
                     await new UserConfigWindows(ViewModel, userConfigExist).ShowDialog((Window)ViewModel.TopLevel);
                 }
             }

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -533,7 +533,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     data.Favorite = appMetadata.Favorite;
                     data.TimePlayed = appMetadata.TimePlayed;
                     data.LastPlayed = appMetadata.LastPlayed;
-                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // just check for file presence
+                    data.UserConfig = File.Exists(Program.GetDirGameUserConfig(data.IdBaseString, false, false)); // Just check user config
                 }
 
                 data.FileExtension = Path.GetExtension(applicationPath).TrimStart('.').ToUpper();

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

@@ -49,13 +49,13 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 configurationFileUpdated = true;
             }
             
-            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value;
-            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value;
-            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value;
-            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value;
-            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value;
-            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value;
-            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value;
+            EnableDiscordIntegration.Value = LoadSetting ? cff.EnableDiscordIntegration : EnableDiscordIntegration.Value; // Get from global config only
+            CheckUpdatesOnStart.Value = LoadSetting ? cff.CheckUpdatesOnStart : CheckUpdatesOnStart.Value; // Get from global config only
+            ShowConfirmExit.Value = LoadSetting ? cff.ShowConfirmExit : ShowConfirmExit.Value; // Get from global config only
+            RememberWindowState.Value = LoadSetting ? cff.RememberWindowState : RememberWindowState.Value; // Get from global config only
+            ShowTitleBar.Value = LoadSetting ? cff.ShowTitleBar : ShowTitleBar.Value; // Get from global config only
+            EnableHardwareAcceleration.Value = LoadSetting ? cff.EnableHardwareAcceleration : EnableHardwareAcceleration.Value; // Get from global config only
+            HideCursor.Value = LoadSetting ? cff.HideCursor : HideCursor.Value; // Get from global config only
 
             Logger.EnableFileLog.Value = cff.EnableFileLog;
             Logger.EnableDebug.Value = cff.LoggingEnableDebug;
@@ -91,7 +91,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.Language.Value = cff.SystemLanguage;
             System.Region.Value = cff.SystemRegion;
             System.TimeZone.Value = cff.SystemTimeZone;
-            System.SystemTimeOffset.Value = cff.SystemTimeOffset;
+            System.SystemTimeOffset.Value = LoadSetting ? cff.SystemTimeOffset : System.SystemTimeOffset.Value; // Get from global config only
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;
@@ -145,7 +145,7 @@ namespace Ryujinx.Ava.Utilities.Configuration
 
             Hid.EnableKeyboard.Value = cff.EnableKeyboard;
             Hid.EnableMouse.Value = cff.EnableMouse;
-            Hid.Hotkeys.Value = cff.Hotkeys;
+            Hid.Hotkeys.Value = LoadSetting ? cff.Hotkeys : Hid.Hotkeys.Value; // Get from global config only
             Hid.InputConfig.Value = cff.InputConfig ?? [];
             Hid.RainbowSpeed.Value = cff.RainbowSpeed;