Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-09-29 17:17:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix custom settings for Avalonia 12

Browse Source
This commit is contained in:
KeatonTheBot
2026-09-05 14:13:06 -05:00
parent 9514d4c2c2
commit 1bad72a388
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Ryujinx/UI/Views/Settings/CustomSettingsAudioView.axaml
+1 -1
View File
@@ -52,7 +52,7 @@
Text="{locale:Locale SettingsTabSystemAudioVolume}" Text="{locale:Locale SettingsTabSystemAudioVolume}"
ToolTip.Tip="{locale:Locale AudioVolumeTooltip}" ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
Width="250" /> Width="250" />
<ui:NumberBox Value="{Binding Volume}" <ui:FANumberBox Value="{Binding Volume}"
ToolTip.Tip="{locale:Locale AudioVolumeTooltip}" ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
Width="350" Width="350"
SmallChange="1" SmallChange="1"
src/Ryujinx/UI/Views/Settings/CustomSettingsCPUView.axaml
+1 -1
View File
@@ -95,7 +95,7 @@
Text="{locale:Locale SettingsTabSystemTurboMultiplier}" Text="{locale:Locale SettingsTabSystemTurboMultiplier}"
ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierToolTip}" ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierToolTip}"
Width="250" /> Width="250" />
<ui:NumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueToolTip}" <ui:FANumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueToolTip}"
Value="{Binding TurboMultiplier}" Value="{Binding TurboMultiplier}"
Width="165" Width="165"
SmallChange="1.0" SmallChange="1.0"
src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml
+17 -17
View File
@@ -34,7 +34,7 @@
<settings:CustomSettingsGraphicsView Name="GraphicsPage" /> <settings:CustomSettingsGraphicsView Name="GraphicsPage" />
<settings:CustomSettingsAudioView Name="AudioPage" /> <settings:CustomSettingsAudioView Name="AudioPage" />
</Grid> </Grid>
<ui:NavigationView <ui:FANavigationView
Grid.Row="1" Grid.Row="1"
IsSettingsVisible="False" IsSettingsVisible="False"
Name="NavPanel" Name="NavPanel"
@@ -44,7 +44,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
OpenPaneLength="200"> OpenPaneLength="200">
<ui:NavigationView.PaneHeader> <ui:FANavigationView.PaneHeader>
<Border <Border
Margin="10" Margin="10"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@@ -64,39 +64,39 @@
</Grid> </Grid>
</Grid> </Grid>
</Border> </Border>
</ui:NavigationView.PaneHeader> </ui:FANavigationView.PaneHeader>
<ui:NavigationView.MenuItems> <ui:FANavigationView.MenuItems>
<ui:NavigationViewItem <ui:FANavigationViewItem
Content="{locale:Locale SettingsTabSystem}" Content="{locale:Locale SettingsTabSystem}"
Tag="SystemPage" Tag="SystemPage"
IconSource="Settings" /> IconSource="Settings" />
<ui:NavigationViewItem <ui:FANavigationViewItem
Content="{locale:Locale SettingsTabCpu}" Content="{locale:Locale SettingsTabCpu}"
Tag="CpuPage"> Tag="CpuPage">
<ui:NavigationViewItem.IconSource> <ui:FANavigationViewItem.IconSource>
<ui:FontIconSource <ui:FAFontIconSource
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons" FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
Glyph="{helpers:GlyphValueConverter Chip}" /> Glyph="{helpers:GlyphValueConverter Chip}" />
</ui:NavigationViewItem.IconSource> </ui:FANavigationViewItem.IconSource>
</ui:NavigationViewItem> </ui:FANavigationViewItem>
<ui:NavigationViewItem <ui:FANavigationViewItem
Content="{locale:Locale SettingsTabGraphics}" Content="{locale:Locale SettingsTabGraphics}"
Tag="GraphicsPage" Tag="GraphicsPage"
IconSource="Image" /> IconSource="Image" />
<ui:NavigationViewItem <ui:FANavigationViewItem
Content="{locale:Locale SettingsTabAudio}" Content="{locale:Locale SettingsTabAudio}"
IconSource="Audio" IconSource="Audio"
Tag="AudioPage" /> Tag="AudioPage" />
</ui:NavigationView.MenuItems> </ui:FANavigationView.MenuItems>
<ui:NavigationView.Styles> <ui:FANavigationView.Styles>
<Style Selector="Grid#PlaceholderGrid"> <Style Selector="Grid#PlaceholderGrid">
<Setter Property="Height" Value="160" /> <Setter Property="Height" Value="160" />
</Style> </Style>
<Style Selector="ui|NavigationViewItem ui|SymbolIcon"> <Style Selector="ui|FANavigationViewItem ui|FASymbolIcon">
<Setter Property="FlowDirection" Value="LeftToRight" /> <Setter Property="FlowDirection" Value="LeftToRight" />
</Style> </Style>
</ui:NavigationView.Styles> </ui:FANavigationView.Styles>
</ui:NavigationView> </ui:FANavigationView>
<ReversibleStackPanel <ReversibleStackPanel
Grid.Row="2" Grid.Row="2"
Margin="10" Margin="10"
src/Ryujinx/UI/Windows/CustomSettingsWindow.axaml.cs
+3 -5
View File
@@ -1,12 +1,10 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Platform;
using Avalonia.Threading;
using FluentAvalonia.Core;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.ViewModels; using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.HLE.FileSystem; using Ryujinx.HLE.FileSystem;
using System; using System;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.Ava.UI.Windows namespace Ryujinx.Ava.UI.Windows
@@ -79,9 +77,9 @@ namespace Ryujinx.Ava.UI.Windows
NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0); NavPanel.SelectedItem = NavPanel.MenuItems.ElementAt(0);
} }
private void NavPanelOnSelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e) private void NavPanelOnSelectionChanged(object sender, FANavigationViewSelectionChangedEventArgs e)
{ {
if (e.SelectedItem is NavigationViewItem navItem && navItem.Tag is not null) if (e.SelectedItem is FANavigationViewItem navItem && navItem.Tag is not null)
{ {
switch (navItem.Tag.ToString()) switch (navItem.Tag.ToString())
{ {