Merge fa463c51f8 into aa8ba8b503

src/Ryujinx.HLE/HOS/Services/SurfaceFlinger/SurfaceFlinger.cs

@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
 {

src/Ryujinx/Ryujinx.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
@@ -172,10 +172,5 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Windows\UserConfigWindows.axaml.cs">
-      <DependentUpon>UserConfigWindows.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 
 </Project>

src/Ryujinx/UI/Windows/UserConfigWindows.axaml

@@ -29,6 +29,7 @@
             IsVisible="False"
             KeyboardNavigation.IsTabStop="False"/>
         <Grid Name="Pages" IsVisible="False" Grid.Row="2">
+            <settings:SettingsInputView Name="InputPage" />
             <settings:SettingsSystemView Name="SystemPage" />
             <settings:SettingsCPUView Name="CpuPage" />
             <settings:SettingsGraphicsView Name="GraphicsPage" />
@@ -79,6 +80,10 @@
             </ui:NavigationView.PaneHeader>
                       
             <ui:NavigationView.MenuItems>
+                <ui:NavigationViewItem
+                    Content="{ext:Locale SettingsTabInput}"
+                    Tag="InputPage"
+                    IconSource="Games" />
                 <ui:NavigationViewItem
                     Content="{ext:Locale SettingsTabSystem}"
                     Tag="SystemPage"

src/Ryujinx/UI/Windows/UserConfigWindows.axaml.cs

@@ -41,6 +41,7 @@ namespace Ryujinx.Ava.UI.Windows
                 viewModel.SelectedApplication.Icon);
 
             ViewModel.CloseWindow += Close;
+            ViewModel.SaveSettingsEvent += SaveSettings;
 
             InitializeComponent();
             Load();
@@ -51,6 +52,11 @@ namespace Ryujinx.Ava.UI.Windows
            
         }
 
+        public void SaveSettings()
+        {
+            InputPage.InputView?.SaveCurrentProfile();
+        }
+
 
         private void Load()
         {
@@ -67,9 +73,9 @@ namespace Ryujinx.Ava.UI.Windows
             {
                 switch (navItem.Tag.ToString())
                 {
-                    //case nameof(InputPage):
-                    //   NavPanel.Content = InputPage;
-                    //   break;
+                    case nameof(InputPage):
+                        NavPanel.Content = InputPage;
+                        break;
                     case nameof(SystemPage):
                         SystemPage.ViewModel = ViewModel;
                         NavPanel.Content = SystemPage;