diff --git a/src/Ryujinx/UI/Controls/StatusBarSeparator.cs b/src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
similarity index 100%
rename from src/Ryujinx/UI/Controls/StatusBarSeparator.cs
rename to src/Ryujinx/UI/Controls/MiniVerticalSeparator.cs
diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
index 555ded9fc..3fba2b804 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/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">
- <CheckBox
- Margin="10"
- MinWidth="0"
- Grid.Column="0"
- IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
- <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
- </CheckBox>
- <Button
- Margin="10"
- Grid.Column="1"
- Command="{Binding ShowMotionConfig}">
- <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
- </Button>
- </Grid>
- </Border>
- <Border
- BorderBrush="{DynamicResource ThemeControlBorderColor}"
- BorderThickness="1"
- CornerRadius="5"
- HorizontalAlignment="Stretch"
- Margin="0,-1,0,0">
- <Grid ColumnDefinitions="*,Auto">
- <CheckBox
- Margin="10"
- MinWidth="0"
- Grid.Column="0"
- IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
- <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
- </CheckBox>
- <Button
- Margin="10"
- Grid.Column="1"
- Command="{Binding ShowRumbleConfig}">
- <TextBlock Text="{ext:Locale ControllerSettingsConfigureGeneral}" />
- </Button>
- </Grid>
- </Border>
- <Border
- BorderBrush="{DynamicResource ThemeControlBorderColor}"
- BorderThickness="1"
- CornerRadius="5"
- HorizontalAlignment="Stretch"
- 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>
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+ <StackPanel Orientation="Vertical" Spacing="5">
+ <CheckBox
+ Margin="10, 10, 10, 0"
+ MinWidth="0"
+ IsChecked="{Binding Config.EnableMotion, Mode=TwoWay}">
+ <TextBlock Text="{ext:Locale ControllerSettingsMotion}" />
+ </CheckBox>
+ <Button
+ Margin="10, 0, 10, 10"
+ Command="{Binding ShowMotionConfig}">
+ <pt:Icon Value="fa-solid fa-gear" />
+ </Button>
+ </StackPanel>
+ <controls:MiniVerticalSeparator Height="64"/>
+ <StackPanel Orientation="Vertical" Spacing="5">
+ <CheckBox
+ Margin="10, 10, 10, 0"
+ MinWidth="0"
+ IsChecked="{Binding Config.EnableRumble, Mode=TwoWay}">
+ <TextBlock Text="{ext:Locale ControllerSettingsRumble}" />
+ </CheckBox>
+ <Button
+ Margin="10, 0, 10, 10"
+ Command="{Binding ShowRumbleConfig}">
+ <pt:Icon Value="fa-solid fa-gear" />
+ </Button>
+ </StackPanel>
+ <controls:MiniVerticalSeparator Height="64" IsVisible="{Binding ParentModel.HasLed}"/>
+ <StackPanel Orientation="Vertical" Spacing="5">
+ <CheckBox
+ Margin="10, 10, 10, 0"
+ MinWidth="0"
+ IsChecked="{Binding Config.EnableLedChanging, Mode=TwoWay}">
+ <TextBlock Text="{ext:Locale ControllerSettingsLed}" />
+ </CheckBox>
+ <Button
+ Margin="10, 0, 10, 10"
+ Command="{Binding ShowLedConfig}">
+ <pt:Icon Value="fa-solid fa-gear" />
+ </Button>
+ </StackPanel>
+ </StackPanel>
</Border>
</StackPanel>
</StackPanel>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
index 1c18a8e4c..ad05efd06 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+++ b/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
- Margin="10"
- HorizontalAlignment="Stretch"
- Orientation="Vertical"
- Spacing="10">
- <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
- <StackPanel Margin="10,0,0,0" Orientation="Vertical">
- <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
- <StackPanel Orientation="Horizontal">
+ <Grid ColumnDefinitions="Auto,Auto,*" HorizontalAlignment="Stretch">
+ <StackPanel
+ Grid.Column="0"
+ Margin="10"
+ HorizontalAlignment="Stretch"
+ Orientation="Vertical"
+ Spacing="10">
+ <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
+ <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 SettingsTabGeneralEnableDiscordRichPresence}" />
+ 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>
- </CheckBox>
- <CheckBox
- IsEnabled="{Binding !IsGameTitleNotNull}"
- Opacity="{Binding PanelOpacity}"
- IsChecked="{Binding ShowConfirmExit}">
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="{ext:Locale SettingsTabGeneralShowConfirmExitDialog}" />
+ <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>
- </CheckBox>
- <CheckBox
- IsEnabled="{Binding !IsGameTitleNotNull}"
- Opacity="{Binding PanelOpacity}"
- IsChecked="{Binding RememberWindowState}">
- <StackPanel Orientation="Horizontal">
- <TextBlock Text="{ext:Locale SettingsTabGeneralRememberWindowState}" />
+ <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>
- </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" />
- <StackPanel Orientation="Horizontal">
- <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
- <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
- </StackPanel>
+ <Border Grid.Column="1"
+ HorizontalAlignment="Center"
+ VerticalAlignment="Top"
+ Margin="10, 10, 10, 0"
+ Height="405"
+ BorderBrush="Gray"
+ Background="Gray"
+ Width="1" />
<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">
+ Margin="10"
+ Spacing="10"
+ Grid.Column="2"
+ Orientation="Vertical" HorizontalAlignment="Stretch">
<StackPanel Orientation="Horizontal">
- <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralAutoloadDirectories}" />
- <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
+ <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGameDirectories}" />
+ <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
- 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>
+ </Grid>
</Border>
</ScrollViewer>
</UserControl>
diff --git a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
index 9bc919f5d..af9e4a08f 100644
--- a/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
+++ b/src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
@@ -40,7 +40,7 @@
<DataTemplate DataType="{x:Type systems:CompatibilityEntry}">
<Grid MinWidth="800"
Margin="10"
- ColumnDefinitions="*,Auto,Auto,*"
+ ColumnDefinitions="Auto,Auto,Auto,*"
Background="Transparent"
ToolTip.Tip="{Binding LocalizedLastUpdated}">
<TextBlock Grid.Column="0"
diff --git a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
index 6dcd13755..f51f14c1e 100644
--- a/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml
@@ -13,7 +13,7 @@
xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
Width="1100"
Height="910"
- MinWidth="800"
+ MinWidth="1037"
MinHeight="480"
WindowStartupLocation="CenterOwner"
x:DataType="viewModels:SettingsViewModel"
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
index 73c1f087a..15d174123 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml
@@ -13,7 +13,7 @@
xmlns:helper="clr-namespace:Ryujinx.Common.Helper;assembly=Ryujinx.Common"
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
Width="1100"
- MinWidth="800"
+ MinWidth="844"
MinHeight="480"
Title="{ext:WindowTitle Settings}"
WindowStartupLocation="CenterOwner"
diff --git a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
index c580aaccb..f68ec7279 100644
--- a/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs
@@ -31,8 +31,8 @@ namespace Ryujinx.Ava.UI.Windows
: NavigationViewPaneDisplayMode.Top;
Height = ConfigurationState.Instance.ShowOldUI
- ? 927
- : 993; // nav panel is put on top with custom title bar so account for new height
+ ? 906
+ : 954; // nav panel is put on top with custom title bar so account for new height
Load();
}