rooferdev
e764a63f95
Adds a per-game FPS cap for the VRR present mode so games whose logic is tied to the frame rate (e.g. TOTK's menu cursor running wild at 200 fps) can be limited, while keeping G-Sync/FreeSync smoothing. The cap is off by default (VRR stays unbounded); 30/60/120 are exposed. Reuses the existing custom-VSync-interval plumbing: when VSyncMode is Vrr and the custom interval is enabled, SurfaceFlinger paces frames at that value (forcing a non-zero swap interval even when a Dynamic FPS mod submits 0) instead of running unbounded, while Window.cs keeps FifoRelaxed so the display still follows the frame rate. EnableCustomVSyncInterval is now read at Switch construction so the per-game setting applies at launch. UI: the VSync dropdown now offers Switch / Unbounded / VRR, with a VRR FPS cap picker shown only for VRR. The legacy Custom mode is hidden (kept in the enum for config compatibility) and the percentage slider / experimental checkbox are removed.
275 lines
14 KiB
XML
275 lines
14 KiB
XML
<UserControl
|
|
x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsSystemView"
|
|
xmlns="https://github.com/avaloniaui"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
|
|
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
|
|
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
|
|
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
|
|
mc:Ignorable="d"
|
|
x:DataType="viewModels:SettingsViewModel">
|
|
<Design.DataContext>
|
|
<viewModels:SettingsViewModel />
|
|
</Design.DataContext>
|
|
<ScrollViewer
|
|
Name="SystemPage"
|
|
HorizontalAlignment="Stretch"
|
|
VerticalAlignment="Stretch"
|
|
HorizontalScrollBarVisibility="Disabled"
|
|
VerticalScrollBarVisibility="Auto">
|
|
<Border Classes="settings">
|
|
<StackPanel
|
|
Margin="10"
|
|
HorizontalAlignment="Stretch"
|
|
Orientation="Vertical"
|
|
Spacing="10">
|
|
<TextBlock
|
|
Classes="h1"
|
|
Text="{ext:Locale SettingsTabSystemCore}" />
|
|
<StackPanel
|
|
Margin="10,0,0,0"
|
|
Orientation="Vertical">
|
|
<StackPanel
|
|
Margin="0,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemSystemRegion}"
|
|
Width="250" />
|
|
<ComboBox
|
|
SelectedIndex="{Binding Region}"
|
|
HorizontalContentAlignment="Left"
|
|
Width="350">
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionChina}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
|
|
</ComboBox>
|
|
</StackPanel>
|
|
<StackPanel
|
|
Margin="0,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemSystemLanguage}"
|
|
Width="250" />
|
|
<ComboBox
|
|
SelectedIndex="{Binding Language}"
|
|
HorizontalContentAlignment="Left"
|
|
Width="350">
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
|
|
</ComboBox>
|
|
</StackPanel>
|
|
<StackPanel
|
|
Margin="0,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemSystemTimeZone}"
|
|
Width="250" />
|
|
<AutoCompleteBox
|
|
Name="TimeZoneBox"
|
|
Width="350"
|
|
MaxDropDownHeight="500"
|
|
FilterMode="Contains"
|
|
ItemsSource="{Binding TimeZones}"
|
|
SelectionChanged="TimeZoneBox_OnSelectionChanged"
|
|
Text="{Binding Path=TimeZone, Mode=OneWay}"
|
|
TextChanged="TimeZoneBox_OnTextChanged"
|
|
ValueMemberBinding="{Binding Mode=OneWay, Converter={x:Static helpers:TimeZoneConverter.Instance}}" />
|
|
</StackPanel>
|
|
<StackPanel
|
|
IsEnabled="{Binding !IsGameTitleNotNull}"
|
|
Opacity="{Binding PanelOpacity}"
|
|
Margin="0,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemSystemTime}"
|
|
Width="250"/>
|
|
<DatePicker
|
|
VerticalAlignment="Center"
|
|
IsEnabled="{Binding !MatchSystemTime}"
|
|
SelectedDate="{Binding CurrentDate}"
|
|
Width="350" />
|
|
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
|
|
</StackPanel>
|
|
<StackPanel
|
|
IsEnabled="{Binding !IsGameTitleNotNull}"
|
|
Opacity="{Binding PanelOpacity}"
|
|
Margin="250,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TimePicker
|
|
VerticalAlignment="Center"
|
|
ClockIdentifier="24HourClock"
|
|
IsEnabled="{Binding !MatchSystemTime}"
|
|
SelectedTime="{Binding CurrentTime}"
|
|
Width="350" />
|
|
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
|
|
</StackPanel>
|
|
<StackPanel
|
|
IsEnabled="{Binding !IsGameTitleNotNull}"
|
|
Opacity="{Binding PanelOpacity}"
|
|
Orientation="Horizontal">
|
|
<CheckBox
|
|
VerticalAlignment="Center"
|
|
IsChecked="{Binding MatchSystemTime}"
|
|
ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemSystemTimeMatch}"
|
|
Width="250"/>
|
|
</CheckBox>
|
|
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}"/>
|
|
</StackPanel>
|
|
<Separator />
|
|
<StackPanel Margin="0,10,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemVSyncMode}"
|
|
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
|
|
Width="250" />
|
|
<ComboBox
|
|
SelectedIndex="{Binding VSyncModeIndex}"
|
|
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
|
|
HorizontalContentAlignment="Left"
|
|
Width="350">
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
|
|
<ComboBoxItem
|
|
Content="VRR" />
|
|
</ComboBox>
|
|
</StackPanel>
|
|
<StackPanel IsVisible="{Binding ShowVrrCapPicker}"
|
|
Margin="0,0,0,10"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="Plafond VRR (FPS)"
|
|
Width="250" />
|
|
<ComboBox
|
|
SelectedIndex="{Binding VrrFpsCapIndex}"
|
|
HorizontalContentAlignment="Left"
|
|
Width="350">
|
|
<ComboBoxItem Content="Off" />
|
|
<ComboBoxItem Content="30" />
|
|
<ComboBoxItem Content="60" />
|
|
<ComboBoxItem Content="120" />
|
|
</ComboBox>
|
|
</StackPanel>
|
|
<CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
|
|
<TextBlock
|
|
Text="{ext:Locale SettingsTabSystemEnableFsIntegrityChecks}"
|
|
ToolTip.Tip="{ext:Locale FsIntegrityToggleTooltip}" />
|
|
</CheckBox>
|
|
</StackPanel>
|
|
<Separator Height="1" />
|
|
<StackPanel
|
|
Orientation="Vertical"
|
|
Spacing="5">
|
|
<TextBlock
|
|
Classes="h1"
|
|
Text="{ext:Locale SettingsTabSystemHacks}" />
|
|
<TextBlock
|
|
Foreground="{DynamicResource SecondaryTextColor}"
|
|
TextDecorations="Underline"
|
|
Text="{ext:Locale SettingsTabSystemHacksNote}" />
|
|
</StackPanel>
|
|
<StackPanel
|
|
Margin="10,0,0,0"
|
|
Orientation="Horizontal">
|
|
<TextBlock
|
|
VerticalAlignment="Center"
|
|
Text="{ext:Locale SettingsTabSystemDramSize}"
|
|
ToolTip.Tip="{ext:Locale DRamTooltip}"
|
|
Width="250" />
|
|
<ComboBox
|
|
SelectedIndex="{Binding DramSize}"
|
|
ToolTip.Tip="{ext:Locale DRamTooltip}"
|
|
HorizontalContentAlignment="Left"
|
|
Width="350">
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemDramSize4GiB}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemDramSize6GiB}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemDramSize8GiB}" />
|
|
<ComboBoxItem
|
|
Content="{ext:Locale SettingsTabSystemDramSize12GiB}" />
|
|
</ComboBox>
|
|
</StackPanel>
|
|
<StackPanel
|
|
Margin="10,0,0,0"
|
|
HorizontalAlignment="Stretch"
|
|
Orientation="Vertical">
|
|
<CheckBox
|
|
IsChecked="{Binding IgnoreMissingServices}"
|
|
ToolTip.Tip="{ext:Locale IgnoreMissingServicesTooltip}">
|
|
<TextBlock Text="{ext:Locale SettingsTabSystemIgnoreMissingServices}" />
|
|
</CheckBox>
|
|
<CheckBox
|
|
IsChecked="{Binding IgnoreApplet}"
|
|
ToolTip.Tip="{ext:Locale IgnoreControllerAppletTooltip}">
|
|
<TextBlock Text="{ext:Locale SettingsTabSystemIgnoreControllerApplet}" />
|
|
</CheckBox>
|
|
<CheckBox
|
|
IsChecked="{Binding SkipUserProfiles}"
|
|
ToolTip.Tip="{ext:Locale SkipUserProfilesTooltip}">
|
|
<TextBlock Text="{ext:Locale SettingsTabSystemSkipUserProfilesManager}" />
|
|
</CheckBox>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
</Border>
|
|
</ScrollViewer>
|
|
</UserControl>
|