UI: Inline game/autoload dir & motion/rumble/led

src/Ryujinx.Common/Configuration/DirtyHack.cs

@@ -9,7 +9,8 @@ namespace Ryujinx.Common.Configuration
     public enum DirtyHack : byte
     {
         Xc2MenuSoftlockFix = 1,
-        ShaderTranslationDelay = 2
+        // ShaderTranslationDelay = 2
+        NifmServiceDisableIsAnyInternetRequestAccepted = 3
     }
 
     public readonly struct EnabledDirtyHack(DirtyHack hack, int value)

src/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs

@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
         // CreateGeneralServiceOld() -> object<nn::nifm::detail::IGeneralService>
         public ResultCode CreateGeneralServiceOld(ServiceCtx context)
         {
-            MakeObject(context, new IGeneralService());
+            MakeObject(context, new IGeneralService(context));
 
             return ResultCode.Success;
         }
@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm
         // CreateGeneralService(u64, pid) -> object<nn::nifm::detail::IGeneralService>
         public ResultCode CreateGeneralService(ServiceCtx context)
         {
-            MakeObject(context, new IGeneralService());
+            MakeObject(context, new IGeneralService(context));
 
             return ResultCode.Success;
         }

src/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE.HOS.Services.Nifm.StaticService.GeneralService;
@@ -17,12 +18,12 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService
         private UnicastIPAddressInformation _targetAddressInfoCache = null;
         private string _cacheChosenInterface = null;
 
-        public IGeneralService()
+        public IGeneralService(ServiceCtx context)
         {
             _generalServiceDetail = new GeneralServiceDetail
             {
                 ClientId = GeneralServiceManager.Count,
-                IsAnyInternetRequestAccepted = true, // NOTE: Why not accept any internet request?
+                IsAnyInternetRequestAccepted = !context.Device.DirtyHacks.IsEnabled(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted), // NOTE: Why not accept any internet request?
             };
 
             NetworkChange.NetworkAddressChanged += LocalInterfaceCacheHandler;

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -161,8 +161,6 @@ namespace Ryujinx.Ava.Systems.Configuration
 
                 Hacks.Xc2MenuSoftlockFix.Value = hacks.IsEnabled(DirtyHack.Xc2MenuSoftlockFix);
                 
-                Hacks.EnableShaderTranslationDelay.Value = hacks.IsEnabled(DirtyHack.ShaderTranslationDelay);
-                Hacks.ShaderTranslationDelay.Value = hacks[DirtyHack.ShaderTranslationDelay].CoerceAtLeast(0);
             }
 
             if (configurationFileUpdated)

src/Ryujinx/Systems/Configuration/ConfigurationState.Model.cs

@@ -683,18 +683,15 @@ namespace Ryujinx.Ava.Systems.Configuration
             
             public ReactiveObject<bool> Xc2MenuSoftlockFix { get; private set; }
             
-            public ReactiveObject<bool> EnableShaderTranslationDelay { get; private set; }
+            public ReactiveObject<bool> DisableNifmIsAnyInternetRequestAccepted { get; private set; }
-            
-            public ReactiveObject<int> ShaderTranslationDelay { get; private set; }
 
             public HacksSection()
             {
                 ShowDirtyHacks = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix = new ReactiveObject<bool>();
                 Xc2MenuSoftlockFix.Event += HackChanged;
-                EnableShaderTranslationDelay = new ReactiveObject<bool>();
+                DisableNifmIsAnyInternetRequestAccepted = new ReactiveObject<bool>();
-                EnableShaderTranslationDelay.Event += HackChanged;
+                DisableNifmIsAnyInternetRequestAccepted.Event += HackChanged;
-                ShaderTranslationDelay = new ReactiveObject<int>();
             }
 
             private void HackChanged(object sender, ReactiveEventArgs<bool> rxe)
@@ -725,8 +722,8 @@ namespace Ryujinx.Ava.Systems.Configuration
                     if (Xc2MenuSoftlockFix)
                         Apply(DirtyHack.Xc2MenuSoftlockFix);
                     
-                    if (EnableShaderTranslationDelay)
+                    if (DisableNifmIsAnyInternetRequestAccepted)
-                        Apply(DirtyHack.ShaderTranslationDelay, ShaderTranslationDelay);
+                        Apply(DirtyHack.NifmServiceDisableIsAnyInternetRequestAccepted);
                     
                     return enabledHacks.ToArray();
 

src/Ryujinx/UI/ViewModels/SettingsHacksViewModel.cs

@@ -16,11 +16,12 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         [ObservableProperty] private bool _xc2MenuSoftlockFix = ConfigurationState.Instance.Hacks.Xc2MenuSoftlockFix;
+        [ObservableProperty] private bool _nifmDisableIsAnyInternetRequestAccepted = ConfigurationState.Instance.Hacks.DisableNifmIsAnyInternetRequestAccepted;
         
         public static string Xc2MenuFixTooltip { get; } = Lambda.String(sb =>
         {
             sb.AppendLine(
-                    "This fix applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
+                    "This hack applies a 2ms delay (via 'Thread.Sleep(2)') every time the game tries to read data from the emulated Switch filesystem.")
                 .AppendLine();
             
             sb.AppendLine("From the issue on GitHub:").AppendLine();
@@ -29,5 +30,14 @@ namespace Ryujinx.Ava.UI.ViewModels
                 "there is a low chance that the game will softlock, " +
                 "the submenu won't show up, while background music is still there.");
         });
+        
+        public static string NifmDisableIsAnyInternetRequestAcceptedTooltip { get; } = Lambda.String(sb =>
+        {
+            sb.AppendLine(
+                    "This hack simply sets 'IsAnyInternetRequestAccepted' to 'false' when initializing the Nifm IGeneralService.")
+                .AppendLine();
+
+            sb.Append("Lets DOOM 2016 go in game.");
+        });
     }
 }

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -757,6 +757,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // Dirty Hacks
             config.Hacks.Xc2MenuSoftlockFix.Value = DirtyHacks.Xc2MenuSoftlockFix;
+            config.Hacks.DisableNifmIsAnyInternetRequestAccepted.Value =
+                DirtyHacks.NifmDisableIsAnyInternetRequestAccepted;
 
             config.ToFileFormat().SaveConfig(Program.ConfigurationPath);
 

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

@@ -4,10 +4,10 @@
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels.Input"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
+    xmlns:pt="using:Projektanker.Icons.Avalonia"
     HorizontalAlignment="Stretch"
     VerticalAlignment="Stretch"
     d:DesignHeight="800"
@@ -507,65 +507,49 @@
                         CornerRadius="5"
                         VerticalAlignment="Bottom"
                         HorizontalAlignment="Stretch">
-                        <Grid ColumnDefinitions="*,Auto">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <CheckBox
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                                Margin="10"
+                                <CheckBox
-                                MinWidth="0"
+                                    Margin="10, 10, 10, 0"
-                                Grid.Column="0"
+                                    MinWidth="0"
-                                IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+                                    IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
+                                    <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
-                            </CheckBox>
+                                </CheckBox>
-                            <Button
+                                <Button
-                                Margin="10"
+                                    Margin="10, 0, 10, 10"
-                                Grid.Column="1"
+                                    Command="{Binding ShowMotionConfig}">
-                                Command="{Binding ShowMotionConfig}">
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                </Button>
-                            </Button>
+                            </StackPanel>
-                        </Grid>
+                            <controls:MiniVerticalSeparator Height="64"/>
-                    </Border>
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                    <Border
+                                <CheckBox
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                    Margin="10, 10, 10, 0"
-                        BorderThickness="1"
+                                    MinWidth="0"
-                        CornerRadius="5"
+                                    IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
-                        HorizontalAlignment="Stretch"
+                                    <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
-                        Margin="0,-1,0,0">
+                                </CheckBox>
-                        <Grid ColumnDefinitions="*,Auto">
+                                <Button
-                            <CheckBox
+                                    Margin="10, 0, 10, 10"
-                                Margin="10"
+                                    Command="{Binding ShowRumbleConfig}">
-                                MinWidth="0"
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                                Grid.Column="0"
+                                </Button>
-                                IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+                            </StackPanel>
-                                <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
+                            <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
-                            </CheckBox>
+                            <StackPanel Orientation="Vertical" Spacing="5">
-                            <Button
+                                <CheckBox
-                                Margin="10"
+                                    Margin="10, 10, 10, 0"
-                                Grid.Column="1"
+                                    MinWidth="0"
-                                Command="{Binding ShowRumbleConfig}">
+                                    IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
+                                    <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                            </Button>
+                                </CheckBox>
-                        </Grid>
+                                <Button
-                    </Border>
+                                    Margin="10, 0, 10, 10"
-                    <Border
+                                    Command="{Binding ShowLedConfig}">
-                        BorderBrush="{DynamicResource ThemeControlBorderColor}"
+                                    <pt:Icon Value="fa-solid fa-gear" />
-                        BorderThickness="1"
+                                </Button>
-                        CornerRadius="5"
+                            </StackPanel>
-                        HorizontalAlignment="Stretch"
+                        </StackPanel>
-                        Margin="0,-1,0,0">
-                        <Grid IsVisible="{Binding ParentModel.HasLed}" ColumnDefinitions="*,Auto">
-                            <CheckBox
-                                Margin="10, 10, 5, 10"
-                                MinWidth="0"
-                                Grid.Column="0"
-                                IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
-                            </CheckBox>
-                            <Button
-                                Margin="10"
-                                Grid.Column="1"
-                                Command="{Binding ShowLedConfig}">
-                                <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
-                            </Button>
-                        </Grid>
                     </Border>
                 </StackPanel>
             </StackPanel>

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

@@ -29,7 +29,7 @@
                 <TextBlock
                     Foreground="{DynamicResource SecondaryTextColor}"
                     TextDecorations="Underline"
-                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Will cause issues." />
+                    Text="Highly specific hacks &amp; tricks to alleviate performance issues, crashing, or freezing. Can cause issues." />
                 <StackPanel
                     Margin="0,10,0,0"
                     Orientation="Horizontal"
@@ -43,6 +43,18 @@
                         Text="Xenoblade Chronicles 2 Menu Softlock Fix" />
                 </StackPanel>
                 <Separator/>
+                <StackPanel
+                    Margin="0,10,0,0"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Center"
+                    ToolTip.Tip="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAcceptedTooltip}">
+                    <CheckBox
+                        Margin="0"
+                        IsChecked="{Binding DirtyHacks.NifmDisableIsAnyInternetRequestAccepted}"/>
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="Disable IsAnyInternetRequestAccepted" />
+                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>

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

@@ -6,7 +6,6 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
     <Design.DataContext>
@@ -19,246 +18,265 @@
         HorizontalScrollBarVisibility="Disabled"
         VerticalScrollBarVisibility="Auto">
         <Border Classes="settings">
-            <StackPanel
+            <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
-                Margin="10"
+                <StackPanel
-                HorizontalAlignment="Stretch"
+                    Grid.Column="0"
-                Orientation="Vertical"
+                    Margin="10"
-                Spacing="10">
+                    HorizontalAlignment="Stretch"
-                <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
+                    Orientation="Vertical"
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                    Spacing="10">
-                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
-                        <StackPanel Orientation="Horizontal">
+                    <StackPanel Margin="10,0,0,0" Orientation="Vertical">
+                        <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock VerticalAlignment="Center"
+                                           ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                           Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding ShowConfirmExit}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding RememberWindowState}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <CheckBox
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            IsChecked="{Binding ShowOldUI}"
+                            ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
+                                <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                            </StackPanel>
+                        </CheckBox>
+                        <StackPanel
+                            Margin="0, 15, 0, 0"
+                            Orientation="Horizontal">
                             <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
+                                       Text="{ext:Locale SettingsTabGeneralFocusLossType}"
-                                       Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
+                                       Width="150" />
+                            <ComboBox SelectedIndex="{Binding FocusLostActionType}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                         </StackPanel>
-                    </CheckBox>
+                        <StackPanel
-                    <CheckBox 
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
-                        Opacity="{Binding PanelOpacity}"
+                            Margin="0, 15, 0, 0"
-                        IsChecked="{Binding ShowConfirmExit}">
+                            Orientation="Horizontal">
-                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+                                       Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
+                                       Width="150" />
+                            <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock
+                                        Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
-                    </CheckBox>
+                        <StackPanel
-                    <CheckBox 
+                            Margin="0, 15, 0, 0"
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Orientation="Horizontal">
-                        Opacity="{Binding PanelOpacity}"
+                            <TextBlock VerticalAlignment="Center"
-                        IsChecked="{Binding RememberWindowState}">
+                                       Text="{ext:Locale SettingsTabGeneralHideCursor}"
-                        <StackPanel Orientation="Horizontal">
+                                       Width="150" />
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+                            <ComboBox SelectedIndex="{Binding HideCursor}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
+                                </ComboBoxItem>
+                            </ComboBox>
+                        </StackPanel>
+                        <StackPanel
+                            IsEnabled="{Binding !IsGameTitleNotNull}"
+                            Opacity="{Binding PanelOpacity}"
+                            Margin="0, 15, 0, 10"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                VerticalAlignment="Center"
+                                Text="{ext:Locale SettingsTabGeneralTheme}"
+                                Width="150" />
+                            <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
+                                      HorizontalContentAlignment="Left"
+                                      MinWidth="100">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
+                                </ComboBoxItem>
+                            </ComboBox>
                             <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
                         </StackPanel>
-                    </CheckBox>
-                    <CheckBox
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        IsChecked="{Binding ShowOldUI}"
-                        ToolTip.Tip="{ext:Locale SettingsTabGeneralShowOldUIToolTip}">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{ext:Locale SettingsTabGeneralShowOldUI}" />
-                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
-                        </StackPanel>
-                    </CheckBox>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralFocusLossType}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding FocusLostActionType}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunch}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
-                    </StackPanel>
-                    <StackPanel 
-                        Margin="0, 15, 0, 0" 
-                        Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{ext:Locale SettingsTabGeneralHideCursor}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding HideCursor}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel 
-                        IsEnabled="{Binding !IsGameTitleNotNull}"
-                        Opacity="{Binding PanelOpacity}"
-                        Margin="0, 15, 0, 10" 
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{ext:Locale SettingsTabGeneralTheme}"
-                            Width="150" />
-                        <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
                     </StackPanel>
                 </StackPanel>
-                <Separator Height="1" />
+                <Border Grid.Column="1"
-                <StackPanel Orientation="Horizontal">
+                        HorizontalAlignment="Center"
-                    <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
+                        VerticalAlignment="Top"
-                    <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                        Margin="10, 10, 10, 0"
-                </StackPanel>
+                        Height="405"
+                        BorderBrush="Gray"
+                        Background="Gray"
+                        Width="1" />
                 <StackPanel
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
+                    Margin="10"
-                    Opacity="{Binding PanelOpacity}"
+                    Spacing="10"
-                    Margin="10,0,0,0"
+                    Grid.Column="2"
-                    HorizontalAlignment="Stretch"
+                    Orientation="Vertical" HorizontalAlignment="Stretch">
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <ListBox
-                        Name="GameDirsList"
-                        MinHeight="120"
-                        ItemsSource="{Binding GameDirectories}">
-                        <ListBox.Styles>
-                            <Style Selector="ListBoxItem">
-                                <Setter Property="Padding" Value="10" />
-                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                            </Style>
-                        </ListBox.Styles>
-                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                        <TextBox
-                            Name="GameDirPathBox"
-                            Margin="0"
-                            ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
-                            VerticalAlignment="Stretch" />
-                        <Button
-                            Name="AddGameDirButton"
-                            Grid.Column="1"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
-                        </Button>
-                        <Button
-                            Name="RemoveGameDirButton"
-                            Grid.Column="2"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
-                            Click="RemoveGameDirButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
-                        </Button>
-                    </Grid>
-                </StackPanel>
-                <Separator Height="1" />
-               <StackPanel Orientation="Vertical" Spacing="5">
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                        <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
-                        <TextBlock  Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+                        <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                    </StackPanel>
+                    <StackPanel
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <ListBox
+                            Name="GameDirsList"
+                            MinHeight="120"
+                            ItemsSource="{Binding GameDirectories}">
+                            <ListBox.Styles>
+                                <Style Selector="ListBoxItem">
+                                    <Setter Property="Padding" Value="10" />
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </ListBox.Styles>
+                        </ListBox>
+                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                            <TextBox
+                                Name="GameDirPathBox"
+                                Margin="0"
+                                ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}"
+                                VerticalAlignment="Stretch" />
+                            <Button
+                                Name="AddGameDirButton"
+                                Grid.Column="1"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
+                            </Button>
+                            <Button
+                                Name="RemoveGameDirButton"
+                                Grid.Column="2"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
+                                Click="RemoveGameDirButton_OnClick">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
+                            </Button>
+                        </Grid>
+                    </StackPanel>
+                    <Separator Height="1" />
+                    <StackPanel Orientation="Vertical" Spacing="5">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
+                            <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
+                        </StackPanel>
+                        <TextBlock Foreground="{DynamicResource SecondaryTextColor}"
+                                   Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
+                    </StackPanel>
+                    <StackPanel
+                        IsEnabled="{Binding !IsGameTitleNotNull}"
+                        Opacity="{Binding PanelOpacity}"
+                        Margin="10,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        Orientation="Vertical"
+                        Spacing="10">
+                        <ListBox
+                            Name="AutoloadDirsList"
+                            MinHeight="100"
+                            ItemsSource="{Binding AutoloadDirectories}">
+                            <ListBox.Styles>
+                                <Style Selector="ListBoxItem">
+                                    <Setter Property="Padding" Value="10" />
+                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
+                                </Style>
+                            </ListBox.Styles>
+                        </ListBox>
+                        <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
+                            <TextBox
+                                Name="AutoloadDirPathBox"
+                                Margin="0"
+                                ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
+                                VerticalAlignment="Stretch" />
+                            <Button
+                                Name="AddAutoloadDirButton"
+                                Grid.Column="1"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralAdd}" />
+                            </Button>
+                            <Button
+                                Name="RemoveAutoloadDirButton"
+                                Grid.Column="2"
+                                MinWidth="90"
+                                Margin="10,0,0,0"
+                                ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
+                                Click="RemoveAutoloadDirButton_OnClick">
+                                <TextBlock HorizontalAlignment="Center"
+                                           Text="{ext:Locale SettingsTabGeneralRemove}" />
+                            </Button>
+                        </Grid>
                     </StackPanel>
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabGeneralAutoloadNote}" />
                 </StackPanel>
-                <StackPanel
+            </Grid>
-                    IsEnabled="{Binding !IsGameTitleNotNull}"
-                    Opacity="{Binding PanelOpacity}"
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <ListBox
-                        Name="AutoloadDirsList"
-                        MinHeight="100"
-                        ItemsSource="{Binding AutoloadDirectories}">
-                        <ListBox.Styles>
-                            <Style Selector="ListBoxItem">
-                                <Setter Property="Padding" Value="10" />
-                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                            </Style>
-                        </ListBox.Styles>
-                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto,Auto">
-                        <TextBox
-                            Name="AutoloadDirPathBox"
-                            Margin="0"
-                            ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}"
-                            VerticalAlignment="Stretch" />
-                        <Button
-                            Name="AddAutoloadDirButton"
-                            Grid.Column="1"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralAdd}" />
-                        </Button>
-                        <Button
-                            Name="RemoveAutoloadDirButton"
-                            Grid.Column="2"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
-                            Click="RemoveAutoloadDirButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{ext:Locale SettingsTabGeneralRemove}" />
-                        </Button>
-                    </Grid>
-                </StackPanel>
-            </StackPanel>
         </Border>
     </ScrollViewer>
 </UserControl>

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

@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
                     : NavigationViewPaneDisplayMode.Top;
 
             Height = ConfigurationState.Instance.ShowOldUI
-                ? 927
+                ? 906
-                : 993; // nav panel is put on top with custom title bar so account for new height
+                : 954; // nav panel is put on top with custom title bar so account for new height
             
             Load();
         }