From 9167833f0aaed972d8ff994a6ce243c4ce7b05e2 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 18 Apr 2024 18:29:40 -0400
Subject: [PATCH] Consolidate SettingsInputView & InputView

---
 src/Ryujinx/UI/Views/Input/InputView.axaml    | 263 ------------------
 src/Ryujinx/UI/Views/Input/InputView.axaml.cs |  61 ----
 .../UI/Views/Settings/SettingsInputView.axaml | 243 +++++++++++++++-
 .../Views/Settings/SettingsInputView.axaml.cs |  52 +++-
 .../UI/Windows/SettingsWindow.axaml.cs        |   2 +-
 5 files changed, 289 insertions(+), 332 deletions(-)
 delete mode 100644 src/Ryujinx/UI/Views/Input/InputView.axaml
 delete mode 100644 src/Ryujinx/UI/Views/Input/InputView.axaml.cs

diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
deleted file mode 100644
index bd36fc581..000000000
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ /dev/null
@@ -1,263 +0,0 @@
-<UserControl
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    d:DesignHeight="800"
-    d:DesignWidth="800"
-    x:Class="Ryujinx.Ava.UI.Views.Input.InputView"
-    x:DataType="viewModels:InputViewModel"
-    x:CompileBindings="True"
-    mc:Ignorable="d"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:InputViewModel />
-    </Design.DataContext>
-    <UserControl.Styles>
-        <Style Selector="ToggleButton">
-            <Setter Property="Width" Value="90" />
-            <Setter Property="Height" Value="27" />
-            <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">
-                <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"
-                        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/Input/InputView.axaml.cs b/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
deleted file mode 100644
index 356381a8a..000000000
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using Avalonia.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Ava.UI.ViewModels.Input;
-
-namespace Ryujinx.Ava.UI.Views.Input
-{
-    public partial class InputView : UserControl
-    {
-        private bool _dialogOpen;
-        private InputViewModel ViewModel { get; set; }
-
-        public InputView()
-        {
-            DataContext = ViewModel = new InputViewModel(this);
-
-            InitializeComponent();
-        }
-
-        public void SaveCurrentProfile()
-        {
-            ViewModel.Save();
-        }
-
-        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (ViewModel.IsModified && !_dialogOpen)
-            {
-                _dialogOpen = true;
-
-                var result = await ContentDialogHelper.CreateConfirmationDialog(
-                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage],
-                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage],
-                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
-                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
-
-                if (result == UserResult.Yes)
-                {
-                    ViewModel.Save();
-                }
-
-                _dialogOpen = false;
-
-                ViewModel.IsModified = false;
-
-                if (e.AddedItems.Count > 0)
-                {
-                    var player = (PlayerModel)e.AddedItems[0];
-                    ViewModel.PlayerId = player.Id;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            ViewModel.Dispose();
-        }
-    }
-}
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
index f474771f9..5428435dc 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml
@@ -2,14 +2,17 @@
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
+    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
+    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
     mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
+    x:DataType="viewModels:InputViewModel">
     <Design.DataContext>
-        <viewModels:SettingsViewModel />
+        <viewModels:InputViewModel />
     </Design.DataContext>
     <ScrollViewer
         Name="InputPage"
@@ -20,7 +23,239 @@
         <Border Classes="settings">
             <Panel
                 Margin="10">
-                <views:InputView Name="InputView" />
+                <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"
+                                    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>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
index fc88e322a..29b8993d5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsInputView.axaml.cs
@@ -1,21 +1,67 @@
 using Avalonia.Controls;
+using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.UI.Views.Input;
 
 namespace Ryujinx.Ava.UI.Views.Settings
 {
     public partial class SettingsInputView : UserControl
     {
-        public SettingsViewModel ViewModel;
+        public SettingsViewModel SettingsViewModel;
+
+        private bool _dialogOpen;
+        private InputViewModel ViewModel { get; set; }
 
         public SettingsInputView(SettingsViewModel viewModel)
         {
-            ViewModel = viewModel;
+            SettingsViewModel = viewModel;
+
+            DataContext = ViewModel = new InputViewModel(this);
+
             InitializeComponent();
         }
 
+        public void SaveCurrentProfile()
+        {
+            ViewModel.Save();
+        }
+
+        private async void PlayerIndexBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (ViewModel.IsModified && !_dialogOpen)
+            {
+                _dialogOpen = true;
+
+                var result = await ContentDialogHelper.CreateConfirmationDialog(
+                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmMessage],
+                    LocaleManager.Instance[LocaleKeys.DialogControllerSettingsModifiedConfirmSubMessage],
+                    LocaleManager.Instance[LocaleKeys.InputDialogYes],
+                    LocaleManager.Instance[LocaleKeys.InputDialogNo],
+                    LocaleManager.Instance[LocaleKeys.RyujinxConfirm]);
+
+                if (result == UserResult.Yes)
+                {
+                    ViewModel.Save();
+                }
+
+                _dialogOpen = false;
+
+                ViewModel.IsModified = false;
+
+                if (e.AddedItems.Count > 0)
+                {
+                    var player = (PlayerModel)e.AddedItems[0];
+                    ViewModel.PlayerId = player.Id;
+                }
+            }
+        }
+
         public void Dispose()
         {
-            InputView.Dispose();
+            ViewModel.Dispose();
         }
     }
 }
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
index ff05a2401..9d6fb6c7c 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -79,7 +79,7 @@ namespace Ryujinx.Ava.UI.Windows
 
         public void SaveSettings()
         {
-            InputPage.InputView?.SaveCurrentProfile();
+            InputPage.SaveCurrentProfile();
 
             if (Owner is MainWindow window && ViewModel.DirectoryChanged)
             {