From a0594e81698066293feb0e94eecea84fe952399d Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 23 Feb 2025 10:20:42 +1000
Subject: [PATCH 01/12] Improved interaction with "Input" settings.

- paired devices have notifications that they are configured and require connection
- paired devices load the configuration when connected
- A notification appears when changing control configuration settings.
- Now control settings will be saved only when they are changed
- Added a button to roll back changes to the previously saved state
- Fixed a bug: when switching the "player", if the "input device" and "controller type" settings were changed, the save dialog box did not appear.
- "Motion", "Rumble" and "Led" also have events notifying about changes
---
 src/Ryujinx/Assets/Styles/Styles.xaml         |  15 +-
 src/Ryujinx/Assets/locales.json               | 100 +++++++++++++
 .../Input/ControllerInputViewModel.cs         |   7 +-
 .../UI/ViewModels/Input/InputViewModel.cs     | 134 ++++++++++++++++--
 .../Views/Input/ControllerInputView.axaml.cs  |  18 ++-
 src/Ryujinx/UI/Views/Input/InputView.axaml    |  68 +++++++--
 src/Ryujinx/UI/Views/Input/InputView.axaml.cs |   5 +-
 .../UI/Views/Input/KeyboardInputView.axaml.cs |   7 +-
 8 files changed, 314 insertions(+), 40 deletions(-)

diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index 5523f551a..03913ecf1 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -1,8 +1,8 @@
-<Styles
+<Styles
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">
+    xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia">   
     <Design.PreviewWith>
         <Border Height="2000"
                 Padding="20">
@@ -41,7 +41,7 @@
                     </StackPanel>
                 </Grid>
                 <ui:NumberBox Value="1" />
-            </StackPanel>
+                </StackPanel>
         </Border>
     </Design.PreviewWith>
     <Style Selector="DropDownButton">
@@ -331,6 +331,15 @@
         <Setter Property="Margin"
                 Value="0,5,0,0" />
     </Style>
+    <Style Selector="TextBlock.pending" >
+        <Setter Property="Foreground" Value="SlateGray"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Text" Value="(pending!)"/>
+    </Style>
+    <Style Selector="StackPanel.globalConfigMarker">
+    </Style>
     <Style Selector="ContextMenu">
         <Setter Property="BorderBrush"
                 Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index dd9459cd6..1a050e647 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -7072,6 +7072,81 @@
         "zh_TW": "新增"
       }
     },
+    {
+      "ID": "ControllerSettingsModifiedNotification",
+      "Translations": {
+        "ar_SA": "(تم التعديل!)",
+        "de_DE": "(modifiziert!)",
+        "el_GR": "(τροποποιημένο!)",
+        "en_US": "(Modified!)",
+        "es_ES": "(modificado!)",
+        "fr_FR": "(modifié!)",
+        "he_IL": "(שונה!)",
+        "it_IT": "(modificato!)",
+        "ja_JP": "(変更済み!)",
+        "ko_KR": "(수정됨!)",
+        "no_NO": "(modifisert!)",
+        "pl_PL": "(zmodyfikowane!)",
+        "pt_BR": "(modificado!)",
+        "ru_RU": "(изменено!)",
+        "sv_SE": "(ändrad!)",
+        "th_TH": "(แก้ไขแล้ว!)",
+        "tr_TR": "(değiştirildi!)",
+        "uk_UA": "(модифіковано!)",
+        "zh_CN": "(已修改!)",
+        "zh_TW": "(已修改!)"
+      }
+    },
+    {
+      "ID": "ControllerSettingsDisableDeviceForSaving",
+      "Translations": {
+        "ar_SA": "تم إعداد التحكم.\n\nفي انتظار اتصال وحدة التحكم...",
+        "de_DE": "Steuerung konfiguriert.\n\nWarten auf die Verbindung des Controllers...",
+        "el_GR": "Η διαχείριση έχει ρυθμιστεί.\n\nΑναμένεται σύνδεση του χειριστηρίου...",
+        "en_US": "Control configured.\n\nWaiting for controller connection...",
+        "es_ES": "Control configurado.\n\nEsperando la conexión del controlador...",
+        "fr_FR": "Contrôle configuré.\n\nEn attente de la connexion du contrôleur...",
+        "he_IL": "השליטה הוגדרה.\n\nממתין לחיבור הבקר...",
+        "it_IT": "Controllo configurato.\n\nIn attesa della connessione del controller...",
+        "ja_JP": "コントロールが設定されました。\n\nコントローラーの接続を待っています...",
+        "ko_KR": "제어가 설정되었습니다.\n\n컨트롤러 연결 대기 중...",
+        "no_NO": "Kontroll konfigurert.\n\nVenter på tilkobling av kontroller...",
+        "pl_PL": "Sterowanie skonfigurowane.\n\nOczekiwanie na połączenie kontrolera...",
+        "pt_BR": "Controle configurado.\n\nAguardando conexão do controle...",
+        "ru_RU": "Управление настроено.\n\nОжидается подключение контроллера...",
+        "sv_SE": "Kontroll konfigurerad.\n\nVäntar på anslutning av kontrollen...",
+        "th_TH": "การควบคุมได้รับการตั้งค่าแล้ว\n\nกำลังรอการเชื่อมต่อคอนโทรลเลอร์...",
+        "tr_TR": "Kontrol yapılandırıldı.\n\nKontrolcü bağlantısı bekleniyor...",
+        "uk_UA": "Керування налаштовано.\n\nОчікується підключення контролера...",
+        "zh_CN": "控制已配置。\n\n等待控制器连接...",
+        "zh_TW": "控制已設定。\n\n等待控制器連接..."
+      }
+    },
+    {
+      "ID": "ControllerSettingsUnlink",
+      "Translations": {
+        "ar_SA": "إلغاء الربط",
+        "de_DE": "Entkoppeln",
+        "el_GR": "Αποσύνδεση",
+        "en_US": "Unlink",
+        "es_ES": "Desvincular",
+        "fr_FR": "Dissocier",
+        "he_IL": "ניתוק קישור",
+        "it_IT": "Scollega",
+        "ja_JP": "リンク解除",
+        "ko_KR": "연결 해제",
+        "no_NO": "Frakoble",
+        "pl_PL": "Odłącz",
+        "pt_BR": "Desvincular",
+        "ru_RU": "Отвязать",
+        "sv_SE": "Koppla från",
+        "th_TH": "ยกเลิกการเชื่อมโยง",
+        "tr_TR": "Bağlantıyı Kes",
+        "uk_UA": "Відв'язати",
+        "zh_CN": "解除绑定",
+        "zh_TW": "解除綁定"
+      }
+    },
     {
       "ID": "ControllerSettingsRemove",
       "Translations": {
@@ -11722,6 +11797,31 @@
         "zh_TW": "儲存設定檔"
       }
     },
+    {
+      "ID": "ControllerSettingsCancelCurrentChangesToolTip",
+      "Translations": {
+        "ar_SA": "إلغاء التغييرات الحالية",
+        "de_DE": "Aktuelle Änderungen abbrechen",
+        "el_GR": "Ακύρωση τρεχουσών αλλαγών",
+        "en_US": "Cancel current changes",
+        "es_ES": "Cancelar los cambios actuales",
+        "fr_FR": "Annuler les modifications en cours",
+        "he_IL": "ביטול השינויים הנוכחיים",
+        "it_IT": "Annulla le modifiche correnti",
+        "ja_JP": "現在の変更をキャンセル",
+        "ko_KR": "현재 변경 취소",
+        "no_NO": "Avbryt gjeldende endringer",
+        "pl_PL": "Anuluj bieżące zmiany",
+        "pt_BR": "Cancelar alterações atuais",
+        "ru_RU": "Отменить текущие изменения",
+        "sv_SE": "Avbryt aktuella ändringar",
+        "th_TH": "ยกเลิกการเปลี่ยนแปลงปัจจุบัน",
+        "tr_TR": "Geçerli değişiklikleri iptal et",
+        "uk_UA": "Скасувати поточні зміни",
+        "zh_CN": "取消当前更改",
+        "zh_TW": "取消當前變更"
+      }
+    },
     {
       "ID": "MenuBarFileToolsTakeScreenshot",
       "Translations": {
diff --git a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
index 2b644cffa..4ff088d7b 100644
--- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
@@ -68,18 +68,21 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public async void ShowMotionConfig()
-        {
+        {      
             await MotionInputView.Show(this);
+            ParentModel.IsModified = true;
         }
 
         public async void ShowRumbleConfig()
-        {
+        {        
             await RumbleInputView.Show(this);
+            ParentModel.IsModified = true;
         }
         
         public async void ShowLedConfig()
         {
             await LedInputView.Show(this);
+            ParentModel.IsModified = true;
         }
 
         public void OnParentModelChanged()
diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 5b7bcfd32..885807244 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -91,7 +91,19 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
-        public bool IsModified { get; set; }
+        public bool _isChangeTrackingActive;
+
+        public bool _isModified;
+        public bool IsModified
+        {
+            get => _isModified;
+            set 
+            {
+                _isModified = value;
+                OnPropertyChanged();
+            }
+        }
+
         public event Action NotifyChangesEvent;
 
         public PlayerIndex PlayerIdChoose
@@ -106,14 +118,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             set
             {
                 if (IsModified)
-                {
-
+                {                 
                     _playerIdChoose = value;
                     return;
                 }
-
+             
                 IsModified = false;
                 _playerId = value;
+                _isChangeTrackingActive = false;
 
                 if (!Enum.IsDefined<PlayerIndex>(_playerId))
                 {
@@ -121,13 +133,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 }
                 _isLoaded = false;
-
                 LoadConfiguration();
                 LoadDevice();
                 LoadProfiles();
 
                 _isLoaded = true;
-
+                _isChangeTrackingActive = true;
                 OnPropertyChanged();
             }
         }
@@ -171,11 +182,12 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                             IsLeft = false;
                             break;
                     }
-
+                    
                     LoadInputDriver();
                     LoadProfiles();
+                    SetChangeTrackingActive();
                 }
-
+       
                 OnPropertyChanged();
                 NotifyChanges();
             }
@@ -233,14 +245,28 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                         LoadConfiguration(LoadDefaultConfiguration());
                     }
                 }
-
+                FindPairedDevice();
+                SetChangeTrackingActive();
                 OnPropertyChanged();
                 NotifyChanges();
             }
         }
 
+
         public InputConfig Config { get; set; }
 
+        public bool _notificationView;
+
+        public bool NotificationView
+        {
+            get => _notificationView;
+            set
+            {
+                _notificationView = value;
+                OnPropertyChanged();
+            }
+        }
+
         public InputViewModel(UserControl owner) : this()
         {
             if (Program.PreviewerDetached)
@@ -260,6 +286,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 PlayerId = PlayerIndex.Player1;
             }
+
+            _isChangeTrackingActive = true;
         }
 
         public InputViewModel()
@@ -296,8 +324,54 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
             }
+
+            FindPairedDevice();
         }
 
+        private void FindPairedDevice()
+        {
+            // This feature allows you to display a notification
+            // if a configuration is found, but the gamepad is not connected.
+            if (Config != null)
+            {
+                (DeviceType Type, string Id, string Name) activeDevice = Devices.FirstOrDefault(d => d.Id == Config.Id);
+
+                if (activeDevice.Id != Config.Id)
+                {
+                    // display notification when input device is turned off, and
+                    // if device and configuration do not match (different controllers)
+                    NotificationView = true; 
+                }
+                else
+                {
+                    NotificationView = false;
+                }
+            }
+            else
+            {
+                NotificationView = false;
+            }
+        }
+
+        private void SetChangeTrackingActive()
+        {
+          
+            if (_isChangeTrackingActive)
+            {
+                IsModified = true;
+            }
+        }
+
+
+        public void DisableDeviceForSaving()
+        {
+            // "Disabled" mode is available after unbinding the device
+            // NOTE: the IsModified flag to be able to apply the settings.
+            IsModified = true;
+            NotificationView = false;
+        }
+
+
         public void LoadDevice()
         {
             if (Config == null || Config.Backend == InputBackendType.Invalid)
@@ -363,14 +437,33 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        private void HandleOnGamepadDisconnected(string id)
+        private async void HandleOnGamepadDisconnected(string id)
         {
-            Dispatcher.UIThread.Post(LoadDevices);
+            _isChangeTrackingActive = false;
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                LoadDevices();
+                FindPairedDevice();
+                _isChangeTrackingActive = true;
+                return System.Threading.Tasks.Task.CompletedTask;
+            });
         }
 
-        private void HandleOnGamepadConnected(string id)
+        private async void HandleOnGamepadConnected(string id)
         {
-            Dispatcher.UIThread.Post(LoadDevices);
+            _isChangeTrackingActive = false;
+
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                LoadDevices();
+
+                if (Config != null)
+                {
+                    LoadSavedConfiguration(); // Load configuration after connection if it is in the configuration file
+                }
+
+                _isChangeTrackingActive = true;
+            });
         }
 
         private string GetCurrentGamepadId()
@@ -813,8 +906,23 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
+        public void LoadSavedConfiguration()
+        {        
+            LoadConfiguration();
+            LoadDevice();
+            LoadProfiles();
+            IsModified = false;
+            OnPropertyChanged();
+        }
+
         public void Save()
         {
+            
+            if (!IsModified)
+            {
+                return; //If the input settings were not touched, then do nothing
+            }
+
             IsModified = false;
 
             List<InputConfig> newConfig = [];
diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
index d04085a89..5c540e674 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
@@ -63,8 +63,9 @@ namespace Ryujinx.Ava.UI.Views.Input
                 };
 
                 if (!float.IsNaN(_changeSlider) && _changeSlider != (float)check.Value)
-                {
-                    (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+                {     
+                    FlagInputConfigChanged();
+
                     _changeSlider = (float)check.Value;
                 }
             }
@@ -74,7 +75,8 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             if (sender is CheckBox { IsPointerOver: true })
             {
-                (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+                FlagInputConfigChanged();
+
                 _currentAssigner?.Cancel();
                 _currentAssigner = null;
             }
@@ -101,7 +103,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                         this.Focus(NavigationMethod.Pointer);
 
                         PointerPressed += MouseClick;
-
+                       
                         ControllerInputViewModel viewModel = (DataContext as ControllerInputViewModel);
 
                         IKeyboard keyboard =
@@ -114,7 +116,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                             if (e.ButtonValue.HasValue)
                             {
                                 Button buttonValue = e.ButtonValue.Value;
-                                viewModel.ParentModel.IsModified = true;
+                                FlagInputConfigChanged();
 
                                 switch (button.Name)
                                 {
@@ -208,6 +210,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as ControllerInputViewModel)!.ParentModel.IsModified = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -239,7 +246,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             {
                 gamepad?.ClearLed();
             }
-            
             _currentAssigner?.Cancel();
             _currentAssigner = null;
         }
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index b5bfa666d..fd0ade663 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -50,13 +50,21 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock
+                    <StackPanel 
+                        Orientation="Vertical"                             
                         Margin="5,0,10,0"
-                        Width="90"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{ext:Locale ControllerSettingsPlayer}" />
+                        Width="90">
+                        <TextBlock
+                            Text="{ext:Locale ControllerSettingsPlayer}" />
+                         <TextBlock                        
+                            Classes="pending" 
+                            Text ="{ext:Locale ControllerSettingsModifiedNotification}"
+                            IsVisible="{Binding IsModified}"/>
+                    </StackPanel>
                     <ComboBox
                         Grid.Column="1"
                         Name="PlayerIndexBox"
@@ -71,6 +79,18 @@
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
+                    <Button
+                        Grid.Column="2"
+                            MinWidth="0"
+                            Margin="5,0,0,0"
+                            VerticalAlignment="Center"
+                            ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
+                            Command="{Binding LoadSavedConfiguration}">
+                        <ui:SymbolIcon
+                            Symbol="Cancel"
+                            FontSize="15"
+                            Height="20" />
+                    </Button>
                 </Grid>
                 <!-- Profile Selection -->
                 <Grid
@@ -174,7 +194,7 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding LoadDevices}">
+                        Command="{Binding LoadDevice}">
                         <ui:SymbolIcon
                             Symbol="Refresh"
                             FontSize="15"
@@ -211,15 +231,37 @@
                 </Grid>
             </Grid>
         </StackPanel>
-        <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">
-            <ContentControl.DataTemplates>
-                <DataTemplate DataType="viewModels:ControllerInputViewModel">
-                    <views:ControllerInputView />
-                </DataTemplate>
-                <DataTemplate DataType="viewModels:KeyboardInputViewModel">
-                    <views:KeyboardInputView />
-                </DataTemplate>
-            </ContentControl.DataTemplates>
+        <ContentControl IsVisible="{Binding NotificationView}">
+            <ContentControl.Content>
+                <StackPanel>
+                    <TextBlock 
+                        Margin="5,20,0,0"
+                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />
+        
+                    <Button
+                        MinWidth="0"
+                        Width="90"
+                        Height="27"
+                        Margin="5,10,0,0"
+                        VerticalAlignment="Center"
+                        Command="{Binding DisableDeviceForSaving}">
+                        <TextBlock
+                            Text="{ext:Locale ControllerSettingsUnlink}"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center" />
+                    </Button>
+                </StackPanel>
+            </ContentControl.Content>
         </ContentControl>
+            <ContentControl Content="{Binding ConfigViewModel}" IsVisible="{Binding ShowSettings}">        
+                <ContentControl.DataTemplates>
+                    <DataTemplate DataType="viewModels:ControllerInputViewModel">
+                        <views:ControllerInputView />
+                    </DataTemplate>
+                    <DataTemplate DataType="viewModels:KeyboardInputViewModel">
+                        <views:KeyboardInputView />
+                    </DataTemplate>
+                </ContentControl.DataTemplates>
+            </ContentControl>
     </StackPanel>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
index b1061f70d..063e033fc 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
@@ -62,14 +62,15 @@ namespace Ryujinx.Ava.UI.Views.Input
                     }
                     return;
                 }
-                
-                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
 
                 ViewModel.IsModified = false;
+                ViewModel.PlayerId = ViewModel.PlayerIdChoose;
+                               
             }
             
         }
 
+
         public void Dispose()
         {
             ViewModel.Dispose();
diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
index 99e424d4f..6eef81e97 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -73,7 +73,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                         if (e.ButtonValue.HasValue)
                         {
                             Button buttonValue = e.ButtonValue.Value;
-                            viewModel.ParentModel.IsModified = true;
+                            FlagInputConfigChanged();
 
                             switch (button.Name)
                             {
@@ -184,6 +184,11 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
+        private void FlagInputConfigChanged()
+        {
+            (DataContext as KeyboardInputViewModel)!.ParentModel.IsModified = true;
+        }
+
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;

From 1951fe0077589c85ddfb537bb97711aa1908e7ba Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 23 Feb 2025 15:58:14 +1000
Subject: [PATCH 02/12] Added the ability to delete assigned buttons with the
 right mouse button in the settings.

- for keyboard
- for hotkeys
---
 .../UI/Views/Input/KeyboardInputView.axaml.cs | 56 +++++++++++++++++++
 .../Settings/SettingsHotkeysView.axaml.cs     | 37 ++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
index 6eef81e97..9fa25fa6f 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -8,6 +8,8 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
+using System.Collections.Generic;
+using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -193,11 +195,65 @@ namespace Ryujinx.Ava.UI.Views.Input
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
 
+            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
+
+            if (shouldRemoveBinding)
+            {
+                DeleteBind();
+            }
+
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
+        private void DeleteBind()
+        {
+            if (DataContext is not KeyboardInputViewModel viewModel)
+                return;
+
+            if (_currentAssigner != null)
+            {
+                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
+                {
+                    { "ButtonZl", () => viewModel.Config.ButtonZl = Key.Unbound },
+                    { "ButtonL", () => viewModel.Config.ButtonL = Key.Unbound },
+                    { "ButtonMinus", () => viewModel.Config.ButtonMinus = Key.Unbound },
+                    { "LeftStickButton", () => viewModel.Config.LeftStickButton = Key.Unbound },
+                    { "LeftStickUp", () => viewModel.Config.LeftStickUp = Key.Unbound },
+                    { "LeftStickDown", () => viewModel.Config.LeftStickDown = Key.Unbound },
+                    { "LeftStickRight", () => viewModel.Config.LeftStickRight = Key.Unbound },
+                    { "LeftStickLeft", () => viewModel.Config.LeftStickLeft = Key.Unbound },
+                    { "DpadUp", () => viewModel.Config.DpadUp = Key.Unbound },
+                    { "DpadDown", () => viewModel.Config.DpadDown = Key.Unbound },
+                    { "DpadLeft", () => viewModel.Config.DpadLeft = Key.Unbound },
+                    { "DpadRight", () => viewModel.Config.DpadRight = Key.Unbound },
+                    { "LeftButtonSr", () => viewModel.Config.LeftButtonSr = Key.Unbound },
+                    { "LeftButtonSl", () => viewModel.Config.LeftButtonSl = Key.Unbound },
+                    { "RightButtonSr", () => viewModel.Config.RightButtonSr = Key.Unbound },
+                    { "RightButtonSl", () => viewModel.Config.RightButtonSl = Key.Unbound },
+                    { "ButtonZr", () => viewModel.Config.ButtonZr = Key.Unbound },
+                    { "ButtonR", () => viewModel.Config.ButtonR = Key.Unbound },
+                    { "ButtonPlus", () => viewModel.Config.ButtonPlus = Key.Unbound },
+                    { "ButtonA", () => viewModel.Config.ButtonA = Key.Unbound },
+                    { "ButtonB", () => viewModel.Config.ButtonB = Key.Unbound },
+                    { "ButtonX", () => viewModel.Config.ButtonX = Key.Unbound },
+                    { "ButtonY", () => viewModel.Config.ButtonY = Key.Unbound },
+                    { "RightStickButton", () => viewModel.Config.RightStickButton = Key.Unbound },
+                    { "RightStickUp", () => viewModel.Config.RightStickUp = Key.Unbound },
+                    { "RightStickDown", () => viewModel.Config.RightStickDown = Key.Unbound },
+                    { "RightStickRight", () => viewModel.Config.RightStickRight = Key.Unbound },
+                    { "RightStickLeft", () => viewModel.Config.RightStickLeft = Key.Unbound }
+                };
+
+                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
+                {
+                    action();
+                    FlagInputConfigChanged();
+                }
+            }
+        }
+
         protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnDetachedFromVisualTree(e);
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
index d3d1537e0..759c9014e 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -8,6 +8,8 @@ using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Input;
 using Ryujinx.Input.Assigner;
+using System.Collections.Generic;
+using System;
 using Button = Ryujinx.Input.Button;
 using Key = Ryujinx.Common.Configuration.Hid.Key;
 
@@ -46,12 +48,47 @@ namespace Ryujinx.Ava.UI.Views.Settings
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
+            bool shouldRemoveBinding = e.GetCurrentPoint(this).Properties.IsRightButtonPressed;
 
+            if (shouldRemoveBinding)
+            {
+                DeleteBind();
+            }
+          
             _currentAssigner?.Cancel(shouldUnbind);
 
             PointerPressed -= MouseClick;
         }
 
+        private void DeleteBind()
+        {
+            if (DataContext is not SettingsViewModel viewModel)
+                return;
+
+            if (_currentAssigner != null)
+            {
+                Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
+                {
+                    { "ToggleVSyncMode", () => viewModel.KeyboardHotkey.ToggleVSyncMode = Key.Unbound },
+                    { "Screenshot", () => viewModel.KeyboardHotkey.Screenshot = Key.Unbound },
+                    { "ShowUI", () => viewModel.KeyboardHotkey.ShowUI = Key.Unbound },
+                    { "Pause", () => viewModel.KeyboardHotkey.Pause = Key.Unbound },
+                    { "ToggleMute", () => viewModel.KeyboardHotkey.ToggleMute = Key.Unbound },
+                    { "ResScaleUp", () => viewModel.KeyboardHotkey.ResScaleUp = Key.Unbound },
+                    { "ResScaleDown", () => viewModel.KeyboardHotkey.ResScaleDown = Key.Unbound },
+                    { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
+                    { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
+                    { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
+                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
+                };
+
+                if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
+                {
+                    action();
+                }
+            }
+        }
+
         private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
         {
             if (sender is ToggleButton button)

From d1c15f3562e3b79f73cd92d733fe4594cfb922c3 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 23 Feb 2025 16:16:43 +1000
Subject: [PATCH 03/12] Fixed a bug with the (undo last changes) button in the
 gamepad settings

---
 src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 885807244..d7a894003 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -907,12 +907,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public void LoadSavedConfiguration()
-        {        
-            LoadConfiguration();
-            LoadDevice();
-            LoadProfiles();
-            IsModified = false;
-            OnPropertyChanged();
+        {
+            if (IsModified) // Fixes random gamepad appearance in "disabled" option
+            {
+                LoadDevice();
+                LoadConfiguration();
+                IsModified = false;
+                OnPropertyChanged();
+            }
         }
 
         public void Save()

From 8eea75a6e867bb65d290df6853202d810f8c37c5 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 23 Feb 2025 16:44:10 +1000
Subject: [PATCH 04/12] Small fix

---
 src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index d7a894003..cbfa36774 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -459,7 +459,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 if (Config != null)
                 {
-                    LoadSavedConfiguration(); // Load configuration after connection if it is in the configuration file
+                    // Load configuration after connection if it is in the configuration file
+                    IsModified = true;
+                    LoadSavedConfiguration(); 
                 }
 
                 _isChangeTrackingActive = true;

From 33e3ba9ff25f117f31d95a2e701ffa8aa9a3fad9 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sat, 1 Mar 2025 23:44:05 +1000
Subject: [PATCH 05/12] Fixed profiles on the input page:

- profiles are unlinked from controllers
- sometimes a new profile after saving changed to the previous one, had to select it again (fixed)
- when deleting, the profile now resets the name to "default"
---
 .../UI/ViewModels/Input/InputViewModel.cs     | 22 ++++++++++++++++++-
 src/Ryujinx/UI/Views/Input/InputView.axaml    |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index cbfa36774..d84567919 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -106,6 +106,21 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public event Action NotifyChangesEvent;
 
+        public int _profileChoose;
+        public int ProfileChoose
+        {
+            get => _profileChoose;
+            set
+            {
+                if (value >= 0)
+                {
+                    _profileChoose = value;
+                }
+               
+                OnPropertyChanged();
+            }
+        }
+
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -821,7 +836,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 LoadConfiguration(config);
 
-                LoadDevice();
+                // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers
+                // LoadDevice();
 
                 _isLoaded = true;
 
@@ -873,6 +889,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     await File.WriteAllTextAsync(path, jsonString);
 
                     LoadProfiles();
+
+                    ProfileChoose = ProfilesList.IndexOf(ProfileName); // Show new profile
                 }
                 else
                 {
@@ -905,6 +923,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 }
 
                 LoadProfiles();
+
+                ProfileChoose = 0; // Show default profile
             }
         }
 
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index fd0ade663..7504a8c70 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -117,7 +117,7 @@
                         Name="ProfileBox"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Center"
-                        SelectedIndex="0"
+                        SelectedIndex="{Binding ProfileChoose}"
                         ItemsSource="{Binding ProfilesList}"
                         Text="{Binding ProfileName, Mode=TwoWay}" />
                     <Button

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 06/12] 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()
         {

From e097ea71ff36e141337a3558088dee6a62b9d77c Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Sun, 2 Mar 2025 23:49:40 +1000
Subject: [PATCH 07/12] Fix: exclude device id when loading preset (independent
 presets) fixed bug when selected gamepad disappears if another gamepad was
 disconnected

---
 src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 21ebcdd33..8cb780152 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -465,7 +465,15 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
+
+                if (Config != null)
+                {
+                    // Load configuration after disconnection if it is in the configuration file
+                    IsModified = true;
+                    LoadSavedConfiguration();
+                }
                 FindPairedDevice();
+
                 _isChangeTrackingActive = true;
                 return System.Threading.Tasks.Task.CompletedTask;
             });
@@ -474,7 +482,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private async void HandleOnGamepadConnected(string id)
         {
             _isChangeTrackingActive = false;
-
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
@@ -485,7 +492,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     IsModified = true;
                     LoadSavedConfiguration();                  
                 }
-
                 _isChangeTrackingActive = true;
             });
         }
@@ -847,6 +853,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLoaded = false;
 
+                config.Id = null; // ignore device IDs (there is no longer a need to store device IDs for presets due to their independence from devices)
+
                 LoadConfiguration(config);
 
                 // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers

From 1b7032b589854f045e31a7f5e1771094c63073bb Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Mon, 3 Mar 2025 00:07:05 +1000
Subject: [PATCH 08/12] smal fix

---
 src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 8cb780152..f56a154ea 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -466,12 +466,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 LoadDevices();
 
-                if (Config != null)
-                {
-                    // Load configuration after disconnection if it is in the configuration file
-                    IsModified = true;
-                    LoadSavedConfiguration();
-                }
+                IsModified = true;
+                LoadSavedConfiguration();
                 FindPairedDevice();
 
                 _isChangeTrackingActive = true;

From f2329d0e8af3b5a0b7a7e577f74bf3369d98ad2a Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Mar 2025 14:52:30 +1000
Subject: [PATCH 09/12] Fixed bug with turning off active gamepad (independent
 profiles)

When switching profiles, if the profile does not belong to the gamepad itself, the gamepad began to be displayed as turned off.
Fixed a bug where the return button did not return the initially selected gamepad
---
 .../UI/ViewModels/Input/InputViewModel.cs     | 190 ++++++++----------
 src/Ryujinx/UI/Views/Input/InputView.axaml    |   7 +-
 .../UI/Views/Input/KeyboardInputView.axaml.cs |  65 +++---
 3 files changed, 113 insertions(+), 149 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 0431eab42..52f538a1a 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -88,7 +88,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 string RevertDeviceId { get; set; }
         public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
         public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
 
@@ -116,7 +116,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 // 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();
@@ -167,7 +166,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 LoadDevice();
                 LoadProfiles();
 
-                DeviceIndexBeforeChange = Device;
+                RevertDeviceId = Devices[Device].Id;
                 _isLoaded = true;
                 _isChangeTrackingActive = true;
                 OnPropertyChanged();
@@ -179,6 +178,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _controller;
             set
             {
+                MarkAsChanged();
+
                 _controller = value;
 
                 if (_controller == -1)
@@ -216,7 +217,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     
                     LoadInputDriver();
                     LoadProfiles();
-                    SetChangeTrackingActive();
                 }
        
                 OnPropertyChanged();
@@ -258,10 +258,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             get => _device;
             set
             {
-                if (!IsModified)
-                {
-                    DeviceIndexBeforeChange = _device;
-                }
+                MarkAsChanged();
 
                 _device = value < 0 ? 0 : value;
 
@@ -282,8 +279,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     }
                 }
 
-                FindPairedDevice();
-                SetChangeTrackingActive();
+                FindPairedDeviceInConfigFile();
                 OnPropertyChanged();
                 NotifyChanges();
             }
@@ -363,50 +359,35 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig), VisualStick);
             }
 
-            FindPairedDevice();
+            FindPairedDeviceInConfigFile();
         }
 
-        private void FindPairedDevice()
+        private void FindPairedDeviceInConfigFile()
         {
-            // This feature allows you to display a notification
-            // if a configuration is found, but the gamepad is not connected.
-            if (Config != null)
-            {
-                (DeviceType Type, string Id, string Name) activeDevice = Devices.FirstOrDefault(d => d.Id == Config.Id);
-
-                if (activeDevice.Id != Config.Id)
-                {
-                    // display notification when input device is turned off, and
-                    // if device and configuration do not match (different controllers)
-                    NotificationView = true; 
-                }
-                else
-                {
-                    NotificationView = false;
-                }
-            }
-            else
-            {
-                NotificationView = false;
-            }
+            // This function allows you to output a message about the device configuration found in the file
+            // NOTE: if the configuration is found, we display the message "Waiting for controller connection",
+            // but only if the id gamepad belongs to the selected player
+            NotificationView = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
         }
 
-        private void SetChangeTrackingActive()
+
+        private void MarkAsChanged()
         {
-          
-            if (_isChangeTrackingActive)
+            //If tracking is active, then allow changing the modifier      
+            if (!IsModified && _isChangeTrackingActive)
             {
+                RevertDeviceId = Devices[Device].Id; // Remember the device to undo changes
                 IsModified = true;
             }
         }
 
 
-        public void DisableDeviceForSaving()
+        public void UnlinkDevice()
         {
             // "Disabled" mode is available after unbinding the device
             // NOTE: the IsModified flag to be able to apply the settings.
-            IsModified = true;
             NotificationView = false;
+            IsModified = true;
         }
 
 
@@ -477,34 +458,31 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         private async void HandleOnGamepadDisconnected(string id)
         {
-            _isChangeTrackingActive = false;
+            _isChangeTrackingActive = false; // Disable configuration change tracking
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
 
                 IsModified = true;
-                LoadSavedConfiguration();
-                FindPairedDevice();
+                RevertChanges();
+                FindPairedDeviceInConfigFile();
 
-                _isChangeTrackingActive = true;
+                _isChangeTrackingActive = true; // Enable configuration change tracking
                 return System.Threading.Tasks.Task.CompletedTask;
             });
         }
 
         private async void HandleOnGamepadConnected(string id)
         {
-            _isChangeTrackingActive = false;
+            _isChangeTrackingActive = false; // Disable configuration change tracking
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 LoadDevices();
 
-                if (Config != null)
-                {
-                    // Load configuration after connection if it is in the configuration file
-                    IsModified = true;
-                    LoadSavedConfiguration();                  
-                }
-                _isChangeTrackingActive = true;
+                IsModified = true;
+                RevertChanges();                  
+
+                _isChangeTrackingActive = true;// Enable configuration change tracking
             });
         }
 
@@ -809,9 +787,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         }
 
         public void LoadProfileButton()
-        {
-            IsModified = true;
+        { 
             LoadProfile();
+            IsModified = true;
         }
 
         public async void LoadProfile()
@@ -865,12 +843,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 _isLoaded = false;
 
-                config.Id = null; // ignore device IDs (there is no longer a need to store device IDs for presets due to their independence from devices)
+                config.Id = Config.Id; // Set current device id instead of changing device(independent profiles)
 
                 LoadConfiguration(config);
 
-                // This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers
-                // LoadDevice();
+                //LoadDevice();  This line of code hard-links profiles to controllers, the commented line allows profiles to be applied to all controllers 
 
                 _isLoaded = true;
 
@@ -880,56 +857,58 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public async void SaveProfile()
         {
-            if (Device == 0)
-            {
-                return;
-            }
+           
+           if (Device == 0)
+           {
+               return;
+           }
+           
+           if (ConfigViewModel == null)
+           {
+               return;
+           }
+         
+           if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
+           {
+               await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
 
-            if (ConfigViewModel == null)
-            {
-                return;
-            }
+               return;
+           }
+           else
+           {
+               bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
 
-            if (ProfileName == LocaleManager.Instance[LocaleKeys.ControllerSettingsProfileDefault])
-            {
-                await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileDefaultProfileOverwriteErrorMessage]);
+               if (validFileName)
+               {
+                   string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
 
-                return;
-            }
-            else
-            {
-                bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
+                   InputConfig config = null;
 
-                if (validFileName)
-                {
-                    string path = Path.Combine(GetProfileBasePath(), ProfileName + ".json");
+                   if (IsKeyboard)
+                   {
+                       config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
+                   }
+                   else if (IsController)
+                   {
+                       config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
+                   }
 
-                    InputConfig config = null;
+                   config.ControllerType = Controllers[_controller].Type;
 
-                    if (IsKeyboard)
-                    {
-                        config = (ConfigViewModel as KeyboardInputViewModel).Config.GetConfig();
-                    }
-                    else if (IsController)
-                    {
-                        config = (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
-                    }
+                   string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
 
-                    config.ControllerType = Controllers[_controller].Type;
+                   await File.WriteAllTextAsync(path, jsonString);
 
-                    string jsonString = JsonHelper.Serialize(config, _serializerContext.InputConfig);
+                   LoadProfiles();
 
-                    await File.WriteAllTextAsync(path, jsonString);
-
-                    LoadProfiles();
-
-                    ProfileChoose = ProfileName; // Show new profile
-                }
-                else
-                {
-                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
-                }
-            }
+                   ProfileChoose = ProfileName; // Show new profile
+               }
+               else
+               {
+                   await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance[LocaleKeys.DialogProfileInvalidProfileNameErrorMessage]);
+               }
+           }
+           
         }
 
         public async void RemoveProfile()
@@ -961,22 +940,13 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
-        public void LoadSavedConfiguration()
+        public void RevertChanges()
         {
-            // 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;
-
+                Device = Devices.ToList().FindIndex(d => d.Id == RevertDeviceId);
                 LoadDevice();
                 LoadConfiguration();
-
-                IsModified = false;
-
                 OnPropertyChanged();
-            }
+                IsModified = false;
         }
 
         public void Save()
@@ -988,7 +958,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
 
             IsModified = false;
-            DeviceIndexBeforeChange = Device;
+
+            RevertDeviceId = Devices[Device].Id; // Remember selected device after saving
+
             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 a8c453912..4e695afeb 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -75,7 +75,7 @@
                             Margin="5,0,0,0"
                             VerticalAlignment="Center"
                             ToolTip.Tip="{ext:Locale ControllerSettingsCancelCurrentChangesToolTip}"
-                            Command="{Binding LoadSavedConfiguration}">
+                            Command="{Binding RevertChanges}">
                         <ui:SymbolIcon
                             Symbol="Undo"
                             FontSize="15"
@@ -206,15 +206,14 @@
                 <StackPanel>
                     <TextBlock 
                         Margin="5,20,0,0"
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />
-        
+                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />       
                     <Button
                         MinWidth="0"
                         Width="90"
                         Height="27"
                         Margin="5,10,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding DisableDeviceForSaving}">
+                        Command="{Binding UnlinkDevice}">
                         <TextBlock
                             Text="{ext:Locale ControllerSettingsUnlink}"
                             VerticalAlignment="Center"
diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
index 8c12a0337..6e105181f 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -184,11 +184,6 @@ namespace Ryujinx.Ava.UI.Views.Input
             }
         }
 
-        private void FlagInputConfigChanged()
-        {
-            (DataContext as KeyboardInputViewModel)!.ParentModel.IsModified = true;
-        }
-
         private void MouseClick(object sender, PointerPressedEventArgs e)
         {
             bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
@@ -207,47 +202,45 @@ namespace Ryujinx.Ava.UI.Views.Input
 
         private void DeleteBind()
         {
-            if (DataContext is not KeyboardInputViewModel viewModel)
-                return;
 
             if (_currentAssigner != null)
             {
                 Dictionary<string, Action> buttonActions = new Dictionary<string, Action>
                 {
-                    { "ButtonZl", () => viewModel.Config.ButtonZl = Key.Unbound },
-                    { "ButtonL", () => viewModel.Config.ButtonL = Key.Unbound },
-                    { "ButtonMinus", () => viewModel.Config.ButtonMinus = Key.Unbound },
-                    { "LeftStickButton", () => viewModel.Config.LeftStickButton = Key.Unbound },
-                    { "LeftStickUp", () => viewModel.Config.LeftStickUp = Key.Unbound },
-                    { "LeftStickDown", () => viewModel.Config.LeftStickDown = Key.Unbound },
-                    { "LeftStickRight", () => viewModel.Config.LeftStickRight = Key.Unbound },
-                    { "LeftStickLeft", () => viewModel.Config.LeftStickLeft = Key.Unbound },
-                    { "DpadUp", () => viewModel.Config.DpadUp = Key.Unbound },
-                    { "DpadDown", () => viewModel.Config.DpadDown = Key.Unbound },
-                    { "DpadLeft", () => viewModel.Config.DpadLeft = Key.Unbound },
-                    { "DpadRight", () => viewModel.Config.DpadRight = Key.Unbound },
-                    { "LeftButtonSr", () => viewModel.Config.LeftButtonSr = Key.Unbound },
-                    { "LeftButtonSl", () => viewModel.Config.LeftButtonSl = Key.Unbound },
-                    { "RightButtonSr", () => viewModel.Config.RightButtonSr = Key.Unbound },
-                    { "RightButtonSl", () => viewModel.Config.RightButtonSl = Key.Unbound },
-                    { "ButtonZr", () => viewModel.Config.ButtonZr = Key.Unbound },
-                    { "ButtonR", () => viewModel.Config.ButtonR = Key.Unbound },
-                    { "ButtonPlus", () => viewModel.Config.ButtonPlus = Key.Unbound },
-                    { "ButtonA", () => viewModel.Config.ButtonA = Key.Unbound },
-                    { "ButtonB", () => viewModel.Config.ButtonB = Key.Unbound },
-                    { "ButtonX", () => viewModel.Config.ButtonX = Key.Unbound },
-                    { "ButtonY", () => viewModel.Config.ButtonY = Key.Unbound },
-                    { "RightStickButton", () => viewModel.Config.RightStickButton = Key.Unbound },
-                    { "RightStickUp", () => viewModel.Config.RightStickUp = Key.Unbound },
-                    { "RightStickDown", () => viewModel.Config.RightStickDown = Key.Unbound },
-                    { "RightStickRight", () => viewModel.Config.RightStickRight = Key.Unbound },
-                    { "RightStickLeft", () => viewModel.Config.RightStickLeft = Key.Unbound }
+                    { "ButtonZl", () => ViewModel.Config.ButtonZl = Key.Unbound },
+                    { "ButtonL", () => ViewModel.Config.ButtonL = Key.Unbound },
+                    { "ButtonMinus", () => ViewModel.Config.ButtonMinus = Key.Unbound },
+                    { "LeftStickButton", () => ViewModel.Config.LeftStickButton = Key.Unbound },
+                    { "LeftStickUp", () => ViewModel.Config.LeftStickUp = Key.Unbound },
+                    { "LeftStickDown", () => ViewModel.Config.LeftStickDown = Key.Unbound },
+                    { "LeftStickRight", () => ViewModel.Config.LeftStickRight = Key.Unbound },
+                    { "LeftStickLeft", () => ViewModel.Config.LeftStickLeft = Key.Unbound },
+                    { "DpadUp", () => ViewModel.Config.DpadUp = Key.Unbound },
+                    { "DpadDown", () => ViewModel.Config.DpadDown = Key.Unbound },
+                    { "DpadLeft", () => ViewModel.Config.DpadLeft = Key.Unbound },
+                    { "DpadRight", () => ViewModel.Config.DpadRight = Key.Unbound },
+                    { "LeftButtonSr", () => ViewModel.Config.LeftButtonSr = Key.Unbound },
+                    { "LeftButtonSl", () => ViewModel.Config.LeftButtonSl = Key.Unbound },
+                    { "RightButtonSr", () => ViewModel.Config.RightButtonSr = Key.Unbound },
+                    { "RightButtonSl", () => ViewModel.Config.RightButtonSl = Key.Unbound },
+                    { "ButtonZr", () => ViewModel.Config.ButtonZr = Key.Unbound },
+                    { "ButtonR", () => ViewModel.Config.ButtonR = Key.Unbound },
+                    { "ButtonPlus", () => ViewModel.Config.ButtonPlus = Key.Unbound },
+                    { "ButtonA", () => ViewModel.Config.ButtonA = Key.Unbound },
+                    { "ButtonB", () => ViewModel.Config.ButtonB = Key.Unbound },
+                    { "ButtonX", () => ViewModel.Config.ButtonX = Key.Unbound },
+                    { "ButtonY", () => ViewModel.Config.ButtonY = Key.Unbound },
+                    { "RightStickButton", () => ViewModel.Config.RightStickButton = Key.Unbound },
+                    { "RightStickUp", () => ViewModel.Config.RightStickUp = Key.Unbound },
+                    { "RightStickDown", () => ViewModel.Config.RightStickDown = Key.Unbound },
+                    { "RightStickRight", () => ViewModel.Config.RightStickRight = Key.Unbound },
+                    { "RightStickLeft", () => ViewModel.Config.RightStickLeft = Key.Unbound }
                 };
 
                 if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))
                 {
                     action();
-                    FlagInputConfigChanged();
+                    ViewModel.ParentModel.IsModified = true;
                 }
             }
         }

From db08498a89d16fe4e6153f0a79bd9a9bffb93165 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 6 Mar 2025 17:13:11 +1000
Subject: [PATCH 10/12] Addition: Device Name and ID are displayed when the
 controller is turned off, but the controller is configured.

Added the "Name" property for controllers.
Changed the controller setup message to be more informative.
---
 .../Configuration/Hid/InputConfig.cs          |  5 +++
 src/Ryujinx/Assets/locales.json               | 27 +++++++++++++-
 .../Configuration/ConfigurationState.cs       |  1 +
 .../UI/Models/Input/GamepadInputConfig.cs     |  4 +++
 .../UI/Models/Input/KeyboardInputConfig.cs    |  4 +++
 .../UI/ViewModels/Input/InputViewModel.cs     | 36 +++++++++++--------
 src/Ryujinx/UI/Views/Input/InputView.axaml    |  7 ++--
 7 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs b/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs
index a93b721ad..ccf9ead16 100644
--- a/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs
+++ b/src/Ryujinx.Common/Configuration/Hid/InputConfig.cs
@@ -21,6 +21,11 @@ namespace Ryujinx.Common.Configuration.Hid
         /// </summary>
         public string Id { get; set; }
 
+        /// <summary>
+        /// Controller name
+        /// </summary>
+        public string Name { get; set; }
+
         /// <summary>
         ///  Controller's Type
         /// </summary>
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index eebd33ac6..a65af3b31 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -6922,6 +6922,31 @@
         "zh_TW": "輸入裝置"
       }
     },
+    {
+      "ID": "ControllerSettingsWaitingConnectDevice",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Configuration found:\n\nName:\t{0}\nGUID:\t{1}\n\n Waiting for controller connection...",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "ControllerSettingsRefresh",
       "Translations": {
@@ -24473,4 +24498,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
index 6fe35c744..b30c43224 100644
--- a/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
+++ b/src/Ryujinx/Systems/Configuration/ConfigurationState.cs
@@ -269,6 +269,7 @@ namespace Ryujinx.Ava.Systems.Configuration
                     Version = InputConfig.CurrentVersion,
                     Backend = InputBackendType.WindowKeyboard,
                     Id = "0",
+                    Name = "Keyboard",
                     PlayerIndex = PlayerIndex.Player1,
                     ControllerType = ControllerType.ProController,
                     LeftJoycon = new LeftJoyconCommonConfig<Key>
diff --git a/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs b/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
index 300d7977c..5ebfe4654 100644
--- a/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs
@@ -22,6 +22,8 @@ namespace Ryujinx.Ava.UI.Models.Input
         public float StrongRumble { get; set; }
 
         public string Id { get; set; }
+
+        public string Name { get; set; }
         public ControllerType ControllerType { get; set; }
         public PlayerIndex PlayerIndex { get; set; }
 
@@ -111,6 +113,7 @@ namespace Ryujinx.Ava.UI.Models.Input
             if (config != null)
             {
                 Id = config.Id;
+                Name = config.Name;
                 ControllerType = config.ControllerType;
                 PlayerIndex = config.PlayerIndex;
 
@@ -201,6 +204,7 @@ namespace Ryujinx.Ava.UI.Models.Input
             StandardControllerInputConfig config = new()
             {
                 Id = Id,
+                Name = Name, 
                 Backend = InputBackendType.GamepadSDL2,
                 PlayerIndex = PlayerIndex,
                 ControllerType = ControllerType,
diff --git a/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs b/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
index 2d2e95773..a115aa0f2 100644
--- a/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
@@ -2,12 +2,14 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
+using System.Xml.Linq;
 
 namespace Ryujinx.Ava.UI.Models.Input
 {
     public partial class KeyboardInputConfig : BaseModel
     {
         public string Id { get; set; }
+        public string Name { get; set; }
         public ControllerType ControllerType { get; set; }
         public PlayerIndex PlayerIndex { get; set; }
 
@@ -53,6 +55,7 @@ namespace Ryujinx.Ava.UI.Models.Input
             if (config != null)
             {
                 Id = config.Id;
+                Name = config.Name;
                 ControllerType = config.ControllerType;
                 PlayerIndex = config.PlayerIndex;
 
@@ -100,6 +103,7 @@ namespace Ryujinx.Ava.UI.Models.Input
             StandardKeyboardInputConfig config = new()
             {
                 Id = Id,
+                Name = Name,
                 Backend = InputBackendType.WindowKeyboard,
                 PlayerIndex = PlayerIndex,
                 ControllerType = ControllerType,
diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 52f538a1a..be50113b6 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -51,6 +51,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _device;
         private object _configViewModel;
         [ObservableProperty] private string _profileName;
+        [ObservableProperty] private bool _notificationIsVisible; // Automatically call the NotificationView property with OnPropertyChanged()
+        [ObservableProperty] private string _notificationText; // Automatically call the NotificationText property with OnPropertyChanged()
         private bool _isLoaded;
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -95,6 +97,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool _isChangeTrackingActive;
 
         public bool _isModified;
+
         public bool IsModified
         {
             get => _isModified;
@@ -107,7 +110,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public event Action NotifyChangesEvent;
 
-
         public string _profileChoose;
         public string ProfileChoose
         {
@@ -288,18 +290,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public InputConfig Config { get; set; }
 
-        public bool _notificationView;
-
-        public bool NotificationView
-        {
-            get => _notificationView;
-            set
-            {
-                _notificationView = value;
-                OnPropertyChanged();
-            }
-        }
-
         public InputViewModel(UserControl owner) : this()
         {
             if (Program.PreviewerDetached)
@@ -367,7 +357,18 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             // This function allows you to output a message about the device configuration found in the file
             // NOTE: if the configuration is found, we display the message "Waiting for controller connection",
             // but only if the id gamepad belongs to the selected player
-            NotificationView = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
+            NotificationIsVisible = Config != null && Devices.FirstOrDefault(d => d.Id == Config.Id).Id != Config.Id && Config.PlayerIndex == PlayerId;
+            if (NotificationIsVisible)
+            {
+                if (string.IsNullOrEmpty(Config.Name))
+                {
+                    NotificationText = $"{LocaleManager.Instance[LocaleKeys.ControllerSettingsWaitingConnectDevice].Format("No information", Config.Id)}";
+                }
+                else
+                {
+                    NotificationText = $"{LocaleManager.Instance[LocaleKeys.ControllerSettingsWaitingConnectDevice].Format(Config.Name, Config.Id)}";
+                }
+            }
         }
 
 
@@ -386,7 +387,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         {
             // "Disabled" mode is available after unbinding the device
             // NOTE: the IsModified flag to be able to apply the settings.
-            NotificationView = false;
+            NotificationIsVisible = false;
             IsModified = true;
         }
 
@@ -656,12 +657,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             if (activeDevice.Type == DeviceType.Keyboard)
             {
                 string id = activeDevice.Id;
+                string name = activeDevice.Name;
 
                 config = new StandardKeyboardInputConfig
                 {
                     Version = InputConfig.CurrentVersion,
                     Backend = InputBackendType.WindowKeyboard,
                     Id = id,
+                    Name = name,
                     ControllerType = ControllerType.ProController,
                     LeftJoycon = new LeftJoyconCommonConfig<Key>
                     {
@@ -711,12 +714,14 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                 bool isNintendoStyle = Devices.ToList().FirstOrDefault(x => x.Id == activeDevice.Id).Name.Contains("Nintendo");
 
                 string id = activeDevice.Id.Split(" ")[0];
+                string name = activeDevice.Name;
 
                 config = new StandardControllerInputConfig
                 {
                     Version = InputConfig.CurrentVersion,
                     Backend = InputBackendType.GamepadSDL2,
                     Id = id,
+                    Name = name,
                     ControllerType = ControllerType.ProController,
                     DeadzoneLeft = 0.1f,
                     DeadzoneRight = 0.1f,
@@ -991,6 +996,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     : (ConfigViewModel as ControllerInputViewModel).Config.GetConfig();
                 config.ControllerType = Controllers[_controller].Type;
                 config.PlayerIndex = _playerId;
+                config.Name = device.Name;
 
                 int i = newConfig.FindIndex(x => x.PlayerIndex == PlayerId);
                 if (i == -1)
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index 4e695afeb..13c0df768 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -201,17 +201,18 @@
                 </Grid>
             </Grid>
         </StackPanel>
-        <ContentControl IsVisible="{Binding NotificationView}">
+        <ContentControl IsVisible="{Binding NotificationIsVisible}">
             <ContentControl.Content>
+
                 <StackPanel>
                     <TextBlock 
                         Margin="5,20,0,0"
-                        Text="{ext:Locale ControllerSettingsDisableDeviceForSaving}" />       
+                        Text="{Binding NotificationText}" />       
                     <Button
                         MinWidth="0"
                         Width="90"
                         Height="27"
-                        Margin="5,10,0,0"
+                        Margin="0,10,0,0"
                         VerticalAlignment="Center"
                         Command="{Binding UnlinkDevice}">
                         <TextBlock

From 66acfcbed7bfe94f1dbb4b8d4ab14d1455987299 Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 27 Mar 2025 15:06:43 +1000
Subject: [PATCH 11/12] (Fix) Returned the ability to delete assigned hotkeys
 with the right mouse button

---
 src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
index e257345cb..25a47954a 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -108,6 +108,8 @@ namespace Ryujinx.Ava.UI.Views.Settings
 
                         this.Focus(NavigationMethod.Pointer);
 
+                        PointerPressed += MouseClick;
+
                         IKeyboard keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0");
                         IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);
 

From 5364360fee9d8bd36b91d30b8d11a5e376b2fe1e Mon Sep 17 00:00:00 2001
From: Vova <tehnicalmailone@gmail.com>
Date: Thu, 27 Mar 2025 16:51:19 +1000
Subject: [PATCH 12/12] (Fix) Removing TurboMode hotkey didn't work

---
 src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
index f076af55d..cadf0e1d6 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -81,7 +81,8 @@ namespace Ryujinx.Ava.UI.Views.Settings
                     { "VolumeUp", () => viewModel.KeyboardHotkey.VolumeUp = Key.Unbound },
                     { "VolumeDown", () => viewModel.KeyboardHotkey.VolumeDown = Key.Unbound },
                     { "CustomVSyncIntervalIncrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalIncrement = Key.Unbound },
-                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound }
+                    { "CustomVSyncIntervalDecrement", () => viewModel.KeyboardHotkey.CustomVSyncIntervalDecrement = Key.Unbound },
+                    { "TurboMode", () => viewModel.KeyboardHotkey.TurboMode = Key.Unbound }
                 };
 
                 if (buttonActions.TryGetValue(_currentAssigner.ToggledButton.Name, out Action action))