Move all remaining input controls to Input VM

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -51,6 +51,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private object _configViewModel;
         private string _profileName;
         private bool _isLoaded;
+        private bool _enableDockedMode;
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
 
@@ -70,6 +71,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsRight { get; set; }
         public bool IsLeft { get; set; }
 
+        public bool EnableDockedMode
+        {
+            get => _enableDockedMode;
+            set
+            {
+                _enableDockedMode = value;
+            }
+        }
+        public bool EnableKeyboard { get; set; }
+        public bool EnableMouse { get; set; }
+
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
@@ -288,6 +300,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             {
                 ConfigViewModel = new ControllerInputViewModel(this, new GamepadInputConfig(controllerInputConfig));
             }
+
+            EnableDockedMode = ConfigurationState.Instance.System.EnableDockedMode;
+            EnableKeyboard = ConfigurationState.Instance.Hid.EnableKeyboard;
+            EnableMouse = ConfigurationState.Instance.Hid.EnableMouse;
         }
 
         public void LoadDevice()
@@ -853,6 +869,10 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             // NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.
             ConfigurationState.Instance.Hid.InputConfig.Value = newConfig;
 
+            ConfigurationState.Instance.System.EnableDockedMode.Value = EnableDockedMode;
+            ConfigurationState.Instance.Hid.EnableKeyboard.Value = EnableKeyboard;
+            ConfigurationState.Instance.Hid.EnableMouse.Value = EnableMouse;
+
             ConfigurationState.Instance.ToFileFormat().SaveConfig(Program.ConfigurationPath);
         }
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -146,9 +146,6 @@ namespace Ryujinx.Ava.UI.ViewModels
         public bool ShowConfirmExit { get; set; }
         public bool RememberWindowState { get; set; }
         public int HideCursor { get; set; }
-        public bool EnableDockedMode { get; set; }
-        public bool EnableKeyboard { get; set; }
-        public bool EnableMouse { get; set; }
         public bool EnableVsync { get; set; }
         public bool EnablePptc { get; set; }
         public bool EnableInternetAccess { get; set; }
@@ -418,11 +415,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _ => 0
             };
 
-            // Input
-            EnableDockedMode = config.System.EnableDockedMode;
-            EnableKeyboard = config.Hid.EnableKeyboard;
-            EnableMouse = config.Hid.EnableMouse;
-
             // Keyboard Hotkeys
             KeyboardHotkey = new HotkeyConfig(config.Hid.Hotkeys.Value);
 
@@ -513,11 +505,6 @@ namespace Ryujinx.Ava.UI.ViewModels
                 _ => "Auto"
             };
 
-            // Input
-            config.System.EnableDockedMode.Value = EnableDockedMode;
-            config.Hid.EnableKeyboard.Value = EnableKeyboard;
-            config.Hid.EnableMouse.Value = EnableMouse;
-
             // Keyboard Hotkeys
             config.Hid.Hotkeys.Value = KeyboardHotkey.GetConfig();
 

src/Ryujinx/UI/Views/Input/InputView.axaml

@@ -27,7 +27,14 @@
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
     </UserControl.Styles>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
             <StackPanel
+                Grid.Row="0"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Orientation="Vertical">
@@ -222,4 +229,35 @@
                     </ContentControl.DataTemplates>
                 </ContentControl>
             </StackPanel>
+            <StackPanel
+                Orientation="Vertical"
+                Grid.Row="2">
+                <Separator
+                    Margin="0 10"
+                    Height="1" />
+                <StackPanel
+                    Orientation="Horizontal"
+                    Spacing="10">
+                    <CheckBox
+                        ToolTip.Tip="{locale:Locale DockModeToggleTooltip}"
+                        MinWidth="0"
+                        IsChecked="{Binding EnableDockedMode}">
+                        <TextBlock
+                            Text="{locale:Locale SettingsTabInputEnableDockedMode}" />
+                    </CheckBox>
+                    <CheckBox
+                        ToolTip.Tip="{locale:Locale DirectKeyboardTooltip}"
+                        IsChecked="{Binding EnableKeyboard}">
+                        <TextBlock
+                            Text="{locale:Locale SettingsTabInputDirectKeyboardAccess}" />
+                    </CheckBox>
+                    <CheckBox
+                        ToolTip.Tip="{locale:Locale DirectMouseTooltip}"
+                        IsChecked="{Binding EnableMouse}">
+                        <TextBlock
+                            Text="{locale:Locale SettingsTabInputDirectMouseAccess}" />
+                    </CheckBox>
+                </StackPanel>
+            </StackPanel>
+    </Grid>
 </UserControl>

src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml

@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
@@ -21,46 +20,7 @@
         <Border Classes="settings">
             <Panel
                 Margin="10">
-                <Grid>
+                <views:InputView Name="InputView" />
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <views:InputView
-                        Grid.Row="0"
-                        Name="InputView" />
-                    <StackPanel
-                        Orientation="Vertical"
-                        Grid.Row="2">
-                        <Separator
-                            Margin="0 10"
-                            Height="1" />
-                        <StackPanel
-                            Orientation="Horizontal"
-                            Spacing="10">
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DockModeToggleTooltip}"
-                                MinWidth="0"
-                                IsChecked="{Binding EnableDockedMode}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputEnableDockedMode}" />
-                            </CheckBox>
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectKeyboardTooltip}"
-                                IsChecked="{Binding EnableKeyboard}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectKeyboardAccess}" />
-                            </CheckBox>
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectMouseTooltip}"
-                                IsChecked="{Binding EnableMouse}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectMouseAccess}" />
-                            </CheckBox>
-                        </StackPanel>
-                    </StackPanel>
-                </Grid>
             </Panel>
         </Border>
     </ScrollViewer>