mirrors/kenji-nx
1
0
Fork 0
mirror of https://git.ryujinx.app/kenji-nx/ryujinx.git synced 2025-12-12 10:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Update Avalonia to 11.3.2, FluentAvalonia to 2.4.0

Browse source 
* FluentAvalonia: Disabled NavigationView selection indicator animations due to bugged implementation in 2.1.0+, restoring previous behavior

* Avalonia: Fixed text on certain buttons being larger than normal

* Avalonia: Fixed ComboBox code inserting extra space to the left of selected items
This commit is contained in:
KeatonTheBot 2025-07-29 18:01:11 -05:00
parent 12d7f95468
commit 1443e1a2ff
13 changed files with 229 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Directory.Packages.props
View file

@ -3,18 +3,18 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia" Version="11.0.13" /> <PackageVersion Include="Avalonia" Version="11.3.2" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
<PackageVersion Include="Avalonia.Desktop" Version="11.0.13" /> <PackageVersion Include="Avalonia.Desktop" Version="11.3.2" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" /> <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.2" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" /> <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.2" />
<PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" /> <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.2" />
<PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" /> <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.2" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Concentus" Version="2.2.2" /> <PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.4.1.37" /> <PackageVersion Include="DiscordRichPresence" Version="1.4.1.37" />
<PackageVersion Include="DynamicData" Version="9.4.1" /> <PackageVersion Include="DynamicData" Version="9.4.1" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" /> <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build1" />
<PackageVersion Include="Gommon" Version="2.7.1.1" /> <PackageVersion Include="Gommon" Version="2.7.1.1" />
<PackageVersion Include="Humanizer" Version="2.14.1" /> <PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" /> <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />

6
src/Ryujinx/Ryujinx.csproj
View file

@ -44,11 +44,11 @@
<PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Avalonia.Controls.DataGrid" /> <PackageReference Include="Avalonia.Controls.DataGrid" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" /> <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
<PackageReference Include="Avalonia.Svg" /> <PackageReference Include="Svg.Controls.Avalonia" />
<PackageReference Include="Avalonia.Svg.Skia" /> <PackageReference Include="Svg.Controls.Skia.Avalonia" />
<PackageReference Include="CommandLineParser" /> <PackageReference Include="CommandLineParser" />
<PackageReference Include="DynamicData" /> <PackageReference Include="DynamicData" />
<PackageReference Include="FluentAvaloniaUI" /> <PackageReference Include="FluentAvaloniaUI.NoAnim" />
<PackageReference Include="OpenTK.Core" /> <PackageReference Include="OpenTK.Core" />
<PackageReference Include="Ryujinx.Audio.OpenAL" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" /> <PackageReference Include="Ryujinx.Audio.OpenAL" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" />

23
src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
View file

@ -34,18 +34,17 @@
<ComboBox SelectedIndex="{Binding AudioBackend}" <ComboBox SelectedIndex="{Binding AudioBackend}"
Width="350" Width="350"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" /> Content="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}"> IsEnabled="{Binding IsOpenAlEnabled}"
<TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" /> Content="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}"> IsEnabled="{Binding IsSoundIoEnabled}"
<TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" /> Content="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}"> IsEnabled="{Binding IsSDL2Enabled}"
<TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" /> Content="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Margin="10,0,0,0" Orientation="Horizontal"> <StackPanel Margin="10,0,0,0" Orientation="Horizontal">

17
src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
View file

@ -53,19 +53,14 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}"> ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}"
<TextBlock Content="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}"> ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}"
<TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" /> Content="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}"> ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}"
<TextBlock Content="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<CheckBox IsChecked="{Binding UseHypervisor}" <CheckBox IsChecked="{Binding UseHypervisor}"

159
src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
View file

@ -37,12 +37,12 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}" ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
SelectedIndex="{Binding GraphicsBackendIndex}"> SelectedIndex="{Binding GraphicsBackendIndex}">
<ComboBoxItem IsVisible="{Binding IsVulkanAvailable}"> <ComboBoxItem
<TextBlock Text="Vulkan" /> IsVisible="{Binding IsVulkanAvailable}"
</ComboBoxItem> Content="Vulkan" />
<ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}"> <ComboBoxItem
<TextBlock Text="OpenGL" /> IsEnabled="{Binding IsOpenGLAvailable}"
</ComboBoxItem> Content="OpenGL" />
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}"> <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@ -88,21 +88,16 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"> ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" /> Content="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" /> Content="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ui:NumberBox <ui:NumberBox
Margin="10,0,0,0" Margin="10,0,0,0"
@ -130,24 +125,18 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GraphicsAATooltip}" ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
SelectedIndex="{Binding AntiAliasingEffect}"> SelectedIndex="{Binding AntiAliasingEffect}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="FXAA" />
<TextBlock Text="FXAA" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SmaaLow}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SmaaLow}" /> Content="{locale:Locale SmaaMedium}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SmaaHigh}" />
<TextBlock Text="{locale:Locale SmaaMedium}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SmaaUltra}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SmaaHigh}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SmaaUltra}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -164,18 +153,14 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}" ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
SelectedIndex="{Binding ScalingFilter}"> SelectedIndex="{Binding ScalingFilter}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale GraphicsScalingFilterBilinear}" /> Content="{locale:Locale GraphicsScalingFilterBilinear}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale GraphicsScalingFilterNearest}" />
<TextBlock Text="{locale:Locale GraphicsScalingFilterNearest}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale GraphicsScalingFilterFsr}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale GraphicsScalingFilterFsr}" /> Content="{locale:Locale GraphicsScalingFilterArea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale GraphicsScalingFilterArea}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<controls:SliderScroll Value="{Binding ScalingFilterLevel}" <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}" ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
@ -206,23 +191,16 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale AnisotropyTooltip}"> ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Content="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" /> Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
<TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock
Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -234,24 +212,18 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale AspectRatioTooltip}"> ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" /> Content="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" /> Content="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -269,15 +241,12 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GalThreadingTooltip}" ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}"> SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale CommonAuto}" /> Content="{locale:Locale CommonAuto}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale CommonOff}" />
<TextBlock Text="{locale:Locale CommonOff}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale CommonOn}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale CommonOn}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

23
src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
View file

@ -97,19 +97,14 @@
Width="150" Width="150"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale OpenGlLogLevel}"> ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
<TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -117,4 +112,4 @@
</StackPanel> </StackPanel>
</Border> </Border>
</ScrollViewer> </ScrollViewer>
</UserControl> </UserControl>

15
src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
View file

@ -33,15 +33,12 @@
ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}" ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="250"> Width="250">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale MultiplayerModeDisabled}" /> Content="{locale:Locale MultiplayerModeDisabled}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale MultiplayerModeLdnRyu}" />
<TextBlock Text="{locale:Locale MultiplayerModeLdnRyu}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale MultiplayerModeLdnMitm}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale MultiplayerModeLdnMitm}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}"> <CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}">
<TextBlock Text="{locale:Locale MultiplayerDisableP2P}" <TextBlock Text="{locale:Locale MultiplayerDisableP2P}"

175
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
View file

@ -45,27 +45,20 @@
ToolTip.Tip="{locale:Locale RegionTooltip}" ToolTip.Tip="{locale:Locale RegionTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" /> Content="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" /> Content="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemRegionChina}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" /> Content="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -81,60 +74,42 @@
ToolTip.Tip="{locale:Locale LanguageTooltip}" ToolTip.Tip="{locale:Locale LanguageTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" /> Content="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" /> Content="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" /> Content="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" /> Content="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" /> Content="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" /> Content="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -208,15 +183,12 @@
ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}" ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" /> Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ComboBox <ComboBox
IsVisible="{Binding !EnableCustomVSyncInterval}" IsVisible="{Binding !EnableCustomVSyncInterval}"
@ -224,12 +196,10 @@
ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}" ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" /> Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel IsVisible="{Binding EnableCustomVSyncInterval}" <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@ -286,21 +256,16 @@
ToolTip.Tip="{locale:Locale DRamTooltip}" ToolTip.Tip="{locale:Locale DRamTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize4GiB}" /> Content="{locale:Locale SettingsTabSystemDramSize4GiB}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemDramSize6GiB}" />
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize6GiB}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabSystemDramSize8GiB}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize8GiB}" /> Content="{locale:Locale SettingsTabSystemDramSize10GiB}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabSystemDramSize12GiB}" />
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize10GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel

30
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View file

@ -46,15 +46,12 @@
<ComboBox SelectedIndex="{Binding HideCursor}" <ComboBox SelectedIndex="{Binding HideCursor}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" /> Content="{locale:Locale SettingsTabGeneralHideCursorNever}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal"> <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
@ -65,15 +62,12 @@
<ComboBox SelectedIndex="{Binding BaseStyleIndex}" <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{locale:Locale SettingsTabGeneralThemeAuto}" /> Content="{locale:Locale SettingsTabGeneralThemeAuto}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{locale:Locale SettingsTabGeneralThemeLight}" />
<TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" /> <ComboBoxItem
</ComboBoxItem> Content="{locale:Locale SettingsTabGeneralThemeDark}" />
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

20
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View file

@ -98,20 +98,24 @@
Spacing="10"> Spacing="10">
<Button <Button
Name="DeleteButton" Name="DeleteButton"
Click="DeleteButton_Click" Click="DeleteButton_Click">
Content="{locale:Locale UserProfilesDelete}" /> <TextBlock Text="{locale:Locale UserProfilesDelete}" />
</Button>
<Button <Button
Name="ChangePictureButton" Name="ChangePictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{locale:Locale UserProfilesChangeProfileImage}" /> <TextBlock Text="{locale:Locale UserProfilesChangeProfileImage}" />
</Button>
<Button <Button
Name="AddPictureButton" Name="AddPictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{locale:Locale UserProfilesSetProfileImage}" /> <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
</Button>
<Button <Button
Name="SaveButton" Name="SaveButton"
Click="SaveButton_Click" Click="SaveButton_Click">
Content="{locale:Locale Save}" /> <TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

19
src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
View file

@ -82,27 +82,22 @@
Spacing="10" Spacing="10"
Margin="0 24 0 0" Margin="0 24 0 0"
HorizontalAlignment="Right"> HorizontalAlignment="Right">
<ui:ColorPickerButton <ColorPicker
FlyoutPlacement="Top"
IsMoreButtonVisible="False"
UseColorPalette="False"
UseColorTriangle="False"
UseColorWheel="False"
ShowAcceptDismissButtons="False"
IsAlphaEnabled="False" IsAlphaEnabled="False"
Color="{Binding BackgroundColor, Mode=TwoWay}" Color="{Binding BackgroundColor, Mode=TwoWay}"
Name="ColorButton"> Name="ColorButton">
<ui:ColorPickerButton.Styles> <ColorPicker.Styles>
<Style Selector="Grid#Root > DockPanel > Grid"> <Style Selector="Grid#Root > DockPanel > Grid">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />
</Style> </Style>
</ui:ColorPickerButton.Styles> </ColorPicker.Styles>
</ui:ColorPickerButton> </ColorPicker>
<Button <Button
Content="{locale:Locale AvatarChoose}"
Height="35" Height="35"
Name="ChooseButton" Name="ChooseButton"
Click="ChooseButton_OnClick" /> Click="ChooseButton_OnClick">
<TextBlock Text="{locale:Locale AvatarChoose}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

20
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View file

@ -38,14 +38,16 @@
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left">
Content="{locale:Locale Name}" /> <TextBlock Text="{locale:Locale Name}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left">
Content="{locale:Locale Size}" /> <TextBlock Text="{locale:Locale Size}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
@ -57,14 +59,16 @@
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left">
Content="{locale:Locale OrderAscending}" /> <TextBlock Text="{locale:Locale OrderAscending}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left">
Content="{locale:Locale OrderDescending}" /> <TextBlock Text="{locale:Locale OrderDescending}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">

15
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View file

@ -142,11 +142,13 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="10"> Spacing="10">
<Button <Button
Click="ManageSaves" Click="ManageSaves">
Content="{locale:Locale UserProfilesManageSaves}" /> <TextBlock Text="{locale:Locale UserProfilesManageSaves}" />
</Button>
<Button <Button
Click="RecoverLostAccounts" Click="RecoverLostAccounts">
Content="{locale:Locale UserProfilesRecoverLostAccounts}" /> <TextBlock Text="{locale:Locale UserProfilesRecoverLostAccounts}" />
</Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="1" Grid.Row="1"
@ -154,8 +156,9 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
Click="Close" Click="Close">
Content="{locale:Locale UserProfilesClose}" /> <TextBlock Text="{locale:Locale UserProfilesClose}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>