From 299f2144c86d5647684f102a992476bd34568d0c Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 2 Mar 2025 19:07:49 +1000
Subject: [PATCH] Bug fixes, functionality improvements:

Now the profile changes immediately upon selection.
The icon for restoring settings has been changed.
A bug has been fixed where restoring settings did not restore the previously selected gamepad.
---
 .../UI/ViewModels/Input/InputViewModel.cs     | 46 +++++++++++++------
 src/Ryujinx/UI/Views/Input/InputView.axaml    |  7 +--
 src/Ryujinx/UI/Views/Input/InputView.axaml.cs | 13 +++++-
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index d84567919..21ebcdd33 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -87,7 +87,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsKeyboard => !IsController;
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
-
+        public int DeviceIndexBeforeChange { get; set; }
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
@@ -106,17 +106,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public event Action NotifyChangesEvent;
 
-        public int _profileChoose;
-        public int ProfileChoose
+        public string _profileChoose;
+        public string ProfileChoose
         {
             get => _profileChoose;
             set
             {
-                if (value >= 0)
-                {
-                    _profileChoose = value;
-                }
-               
+                // When you select a profile, the settings from the profile will be applied.
+                // To save the settings, you still need to click the apply button
+
+                _profileChoose = value;
+                LoadProfile();
                 OnPropertyChanged();
             }
         }
@@ -152,6 +152,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 LoadDevice();
                 LoadProfiles();
 
+                DeviceIndexBeforeChange = Device;
                 _isLoaded = true;
                 _isChangeTrackingActive = true;
                 OnPropertyChanged();
@@ -242,6 +243,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _device;
             set
             {
+                if (!IsModified)
+                {
+                    DeviceIndexBeforeChange = _device;
+                }
+
                 _device = value < 0 ? 0 : value;
 
                 if (_device >= Devices.Count)
@@ -260,6 +266,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                         LoadConfiguration(LoadDefaultConfiguration());
                     }
                 }
+
                 FindPairedDevice();
                 SetChangeTrackingActive();
                 OnPropertyChanged();
@@ -476,7 +483,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 {
                     // Load configuration after connection if it is in the configuration file
                     IsModified = true;
-                    LoadSavedConfiguration(); 
+                    LoadSavedConfiguration();                  
                 }
 
                 _isChangeTrackingActive = true;
@@ -783,6 +790,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             return config;
         }
 
+        public void LoadProfileButton()
+        {
+            IsModified = true;
+            LoadProfile();
+        }
+
         public async void LoadProfile()
         {
             if (Device == 0)
@@ -890,7 +903,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                     LoadProfiles();
 
-                    ProfileChoose = ProfilesList.IndexOf(ProfileName); // Show new profile
+                    ProfileChoose = ProfileName; // Show new profile
                 }
                 else
                 {
@@ -924,17 +937,24 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 LoadProfiles();
 
-                ProfileChoose = 0; // Show default profile
+                ProfileChoose = ProfilesList[0].ToString(); // Show default profile
             }
         }
 
         public void LoadSavedConfiguration()
         {
+            // Restores settings and sets the previously selected device to the last saved state
+            // NOTE: The current order allows the configuration and device to be loaded correctly until the configuration is changed.
+
             if (IsModified) // Fixes random gamepad appearance in "disabled" option
             {
+                Device = DeviceIndexBeforeChange;
+
                 LoadDevice();
                 LoadConfiguration();
+
                 IsModified = false;
+
                 OnPropertyChanged();
             }
         }
@@ -948,8 +968,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
 
             IsModified = false;
-
-            List<InputConfig> newConfig = [];
+            DeviceIndexBeforeChange = Device;
+            List <InputConfig> newConfig = [];
 
             newConfig.AddRange(ConfigurationState.Instance.Hid.InputConfig.Value);
 
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index 7504a8c70..89b2146a9 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -87,7 +87,7 @@
                             ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
                             Command="{Binding LoadSavedConfiguration}">
                         <ui:SymbolIcon
-                            Symbol="Cancel"
+                            Symbol="Undo"
                             FontSize="15"
                             Height="20" />
                     </Button>
@@ -117,7 +117,8 @@
                         Name="ProfileBox"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
-                        SelectedIndex="{Binding ProfileChoose}"
+                        SelectedItem="{Binding ProfileChoose, Mode=TwoWay}"
+                        SelectionChanged="ComboBox_SelectionChanged"
                         ItemsSource="{Binding ProfilesList}"
                         Text="{Binding ProfileName, Mode=TwoWay}" />
                     <Button
@@ -126,7 +127,7 @@
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
                         ToolTip.Tip="{ext:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfile}">
+                        Command="{Binding LoadProfileButton}">
                         <ui:SymbolIcon
                             Symbol="View"
                             FontSize="15"
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
index 063e033fc..0676bc6bb 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
@@ -65,11 +66,19 @@ namespace Ryujinx.Ava.UI.Views.Input
 
                 ViewModel.IsModified = false;
                 ViewModel.PlayerId = ViewModel.PlayerIdChoose;
-                               
-            }
+                
+            }   
             
         }
 
+        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (sender is FAComboBox faComboBox)
+            {
+                faComboBox.IsDropDownOpen = false;
+                ViewModel.IsModified = true;
+            }
+        }
 
         public void Dispose()
         {