From ea80d922a661204c948881c4d593287b7ae7a702 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 18 Apr 2024 16:35:24 -0400
Subject: [PATCH] Move all remaining input controls to Input VM

---
 .../UI/ViewModels/Input/InputViewModel.cs     |  20 +
 .../UI/ViewModels/SettingsViewModel.cs        |  13 -
 src/Ryujinx/UI/Views/Input/InputView.axaml    | 426 ++++++++++--------
 .../UI/Views/Settings/SettingsInputView.axaml |  44 +-
 4 files changed, 254 insertions(+), 249 deletions(-)

diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 89cc6496d..a02bf42bd 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/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);
         }
 
diff --git a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs b/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
index 3fda90a64..34c3af354 100644
--- a/src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
+++ b/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();
 
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index b4940941c..bd36fc581 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -27,199 +27,237 @@
             <Setter Property="HorizontalAlignment" Value="Stretch" />
         </Style>
     </UserControl.Styles>
-    <StackPanel
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        Orientation="Vertical">
-        <StackPanel
-            Margin="0 0 0 5"
-            Orientation="Vertical"
-            Spacing="5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Player Selection -->
-                <Grid
-                    Grid.Column="0"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsPlayer}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        Name="PlayerIndexBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        SelectionChanged="PlayerIndexBox_OnSelectionChanged"
-                        ItemsSource="{Binding PlayerIndexes}"
-                        SelectedIndex="{Binding PlayerId}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </Grid>
-                <!-- Profile Selection -->
-                <Grid
-                    Grid.Column="2"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsProfile}" />
-                    <ui:FAComboBox
-                        Grid.Column="1"
-                        IsEditable="True"
-                        Name="ProfileBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        SelectedIndex="0"
-                        ItemsSource="{Binding ProfilesList}"
-                        Text="{Binding ProfileName, Mode=TwoWay}" />
-                    <Button
-                        Grid.Column="2"
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+            <StackPanel
+                Grid.Row="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                Orientation="Vertical">
+                <StackPanel
+                    Margin="0 0 0 5"
+                    Orientation="Vertical"
+                    Spacing="5">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <!-- Player Selection -->
+                        <Grid
+                            Grid.Column="0"
+                            Margin="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Margin="5,0,10,0"
+                                Width="90"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{locale:Locale ControllerSettingsPlayer}" />
+                            <ComboBox
+                                Grid.Column="1"
+                                Name="PlayerIndexBox"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                SelectionChanged="PlayerIndexBox_OnSelectionChanged"
+                                ItemsSource="{Binding PlayerIndexes}"
+                                SelectedIndex="{Binding PlayerId}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Name}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                        </Grid>
+                        <!-- Profile Selection -->
+                        <Grid
+                            Grid.Column="2"
+                            Margin="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Margin="5,0,10,0"
+                                Width="90"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{locale:Locale ControllerSettingsProfile}" />
+                            <ui:FAComboBox
+                                Grid.Column="1"
+                                IsEditable="True"
+                                Name="ProfileBox"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                SelectedIndex="0"
+                                ItemsSource="{Binding ProfilesList}"
+                                Text="{Binding ProfileName, Mode=TwoWay}" />
+                            <Button
+                                Grid.Column="2"
+                                MinWidth="0"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
+                                Command="{Binding LoadProfile}">
+                                <ui:SymbolIcon
+                                    Symbol="Upload"
+                                    FontSize="15"
+                                    Height="20" />
+                            </Button>
+                            <Button
+                                Grid.Column="3"
+                                    MinWidth="0"
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
+                                    Command="{Binding SaveProfile}">
+                                <ui:SymbolIcon
+                                    Symbol="Save"
+                                    FontSize="15"
+                                    Height="20" />
+                            </Button>
+                            <Button
+                                Grid.Column="4"
+                                    MinWidth="0"
+                                    Margin="5,0,0,0"
+                                    VerticalAlignment="Center"
+                                    ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
+                                    Command="{Binding RemoveProfile}">
+                                <ui:SymbolIcon
+                                    Symbol="Delete"
+                                    FontSize="15"
+                                    Height="20" />
+                            </Button>
+                        </Grid>
+                    </Grid>
+                    <Separator />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="10" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <!-- Input Device -->
+                        <Grid
+                            Grid.Column="0"
+                            Margin="2"
+                            HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="5,0,10,0"
+                                Width="90"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{locale:Locale ControllerSettingsInputDevice}" />
+                            <ComboBox
+                                Grid.Column="1"
+                                Name="DeviceBox"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                ItemsSource="{Binding DeviceList}"
+                                SelectedIndex="{Binding Device}" />
+                            <Button
+                                Grid.Column="2"
+                                MinWidth="0"
+                                Margin="5,0,0,0"
+                                VerticalAlignment="Center"
+                                Command="{Binding LoadDevices}">
+                                <ui:SymbolIcon
+                                    Symbol="Refresh"
+                                    FontSize="15"
+                                    Height="20"/>
+                            </Button>
+                        </Grid>
+                        <!-- Controller Type -->
+                        <Grid
+                            Grid.Column="2"
+                            Margin="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Margin="5,0,10,0"
+                                Width="90"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{locale:Locale ControllerSettingsControllerType}" />
+                            <ComboBox
+                                Grid.Column="1"
+                                HorizontalAlignment="Stretch"
+                                ItemsSource="{Binding Controllers}"
+                                SelectedIndex="{Binding Controller}">
+                                <ComboBox.ItemTemplate>
+                                    <DataTemplate DataType="models:ControllerModel">
+                                        <TextBlock Text="{Binding Name}" />
+                                    </DataTemplate>
+                                </ComboBox.ItemTemplate>
+                            </ComboBox>
+                        </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>
+            </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"
-                        Margin="5,0,0,0"
-                        VerticalAlignment="Center"
-                        ToolTip.Tip="{locale:Locale ControllerSettingsLoadProfileToolTip}"
-                        Command="{Binding LoadProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Upload"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                    <Button
-                        Grid.Column="3"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsSaveProfileToolTip}"
-                            Command="{Binding SaveProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Save"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                    <Button
-                        Grid.Column="4"
-                            MinWidth="0"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"
-                            ToolTip.Tip="{locale:Locale ControllerSettingsRemoveProfileToolTip}"
-                            Command="{Binding RemoveProfile}">
-                        <ui:SymbolIcon
-                            Symbol="Delete"
-                            FontSize="15"
-                            Height="20" />
-                    </Button>
-                </Grid>
-            </Grid>
-            <Separator />
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- Input Device -->
-                <Grid
-                    Grid.Column="0"
-                    Margin="2"
-                    HorizontalAlignment="Stretch">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsInputDevice}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        Name="DeviceBox"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Center"
-                        ItemsSource="{Binding DeviceList}"
-                        SelectedIndex="{Binding Device}" />
-                    <Button
-                        Grid.Column="2"
-                        MinWidth="0"
-                        Margin="5,0,0,0"
-                        VerticalAlignment="Center"
-                        Command="{Binding LoadDevices}">
-                        <ui:SymbolIcon
-                            Symbol="Refresh"
-                            FontSize="15"
-                            Height="20"/>
-                    </Button>
-                </Grid>
-                <!-- Controller Type -->
-                <Grid
-                    Grid.Column="2"
-                    Margin="2"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <TextBlock
-                        Margin="5,0,10,0"
-                        Width="90"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale ControllerSettingsControllerType}" />
-                    <ComboBox
-                        Grid.Column="1"
-                        HorizontalAlignment="Stretch"
-                        ItemsSource="{Binding Controllers}"
-                        SelectedIndex="{Binding Controller}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate DataType="models:ControllerModel">
-                                <TextBlock Text="{Binding Name}" />
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </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>
-    </StackPanel>
+                        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>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
index 55c2ed6e3..f474771f9 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/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,47 +20,8 @@
         <Border Classes="settings">
             <Panel
                 Margin="10">
-                <Grid>
-                    <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>
+                <views:InputView Name="InputView" />
             </Panel>
         </Border>
     </ScrollViewer>
-</UserControl>
\ No newline at end of file
+</UserControl>