bel
/
ryubing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch ryujinx:master into ui-userprofiles-and-misc

merge-requests/173/head
Neo 2025-10-25 07:06:47 -05:00
parent c2fc1a8582 c6bc77e4bf
commit 4b2362f18b
22 changed files with 272 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Directory.Packages.props
View File

@ -3,25 +3,25 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Avalonia" Version="11.0.13" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
<PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
<PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
<PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
<PackageVersion Include="Avalonia" Version="11.3.6" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
<PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
<PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
<PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
<PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
<PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2"/>
<PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2"/>
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
<PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
<PackageVersion Include="DynamicData" Version="9.4.1" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
<PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />

2
src/Ryujinx.HLE/Debugger/Debugger.MessageHandler.cs
View File

@ -34,7 +34,7 @@ namespace Ryujinx.HLE.Debugger
case ThreadBreakMessage { Context: { } ctx }:
DebugProcess.DebugStop();
GThread = CThread = ctx.ThreadUid;
GThreadId = CThreadId = ctx.ThreadUid;
_breakHandlerEvent.Set();
_commands.Processor.Reply($"T05thread:{ctx.ThreadUid:x};");
break;

18
src/Ryujinx.HLE/Debugger/Debugger.Rcmd.cs
View File

@ -46,18 +46,18 @@ namespace Ryujinx.HLE.Debugger
public string GetStackTrace()
{
if (GThread == null)
if (GThreadId == null)
return "No thread selected\n";
return Process?.Debugger?.GetGuestStackTrace(DebugProcess.GetThread(GThread.Value)) ?? "No application process found\n";
return Process?.Debugger?.GetGuestStackTrace(DebugProcess.GetThread(GThreadId.Value)) ?? "No application process found\n";
}
public string GetRegisters()
{
if (GThread == null)
if (GThreadId == null)
return "No thread selected\n";
return Process?.Debugger?.GetCpuRegisterPrintout(DebugProcess.GetThread(GThread.Value)) ?? "No application process found\n";
return Process?.Debugger?.GetCpuRegisterPrintout(DebugProcess.GetThread(GThreadId.Value)) ?? "No application process found\n";
}
public string GetMinidump()
@ -66,9 +66,9 @@ namespace Ryujinx.HLE.Debugger
return "No application process found\n";
if (kProcess.Debugger is not { } debugger)
return $"Error getting minidump: debugger is null\n";
return "Error getting minidump: debugger is null\n";
var response = debugger.GetMinidump();
string response = debugger.GetMinidump();
Logger.Info?.Print(LogClass.GdbStub, response);
return response;
@ -81,10 +81,8 @@ namespace Ryujinx.HLE.Debugger
if (Process is not { } kProcess)
return "No application process found\n";
if (kProcess.Debugger is not { } debugger)
return $"Error getting process info: debugger is null\n";
return debugger.GetProcessInfoPrintout();
return kProcess.Debugger?.GetProcessInfoPrintout()
?? "Error getting process info: debugger is null\n";
}
catch (Exception e)
{

12
src/Ryujinx.HLE/Debugger/Debugger.cs
View File

@ -1,9 +1,11 @@
using Gommon;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.Debugger.Gdb;
using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.HOS.Kernel.Threading;
using System;
using System.Collections.Concurrent;
using System.Diagnostics;
using System.Linq;
using System.Net.Sockets;
using System.Threading;
@ -32,8 +34,12 @@ namespace Ryujinx.HLE.Debugger
private bool _shuttingDown;
private readonly ManualResetEventSlim _breakHandlerEvent = new(false);
internal ulong? CThread;
internal ulong? GThread;
internal ulong? CThreadId;
internal ulong? GThreadId;
internal KThread CThread => CThreadId?.Into(DebugProcess.GetThread);
internal KThread GThread => GThreadId?.Into(DebugProcess.GetThread);
public readonly BreakpointManager BreakpointManager;
@ -56,7 +62,7 @@ namespace Ryujinx.HLE.Debugger
internal KThread[] GetThreads() => DebugProcess.ThreadUids.Select(DebugProcess.GetThread).ToArray();
internal bool IsProcess32Bit => DebugProcess.GetThread(GThread ?? DebugProcess.ThreadUids.First()).Context.IsAarch32;
internal bool IsProcess32Bit => DebugProcess.GetThread(GThreadId ?? DebugProcess.ThreadUids.First()).Context.IsAarch32;
internal bool WriteRegister(IExecutionContext ctx, int registerId, StringStream ss) =>
IsProcess32Bit

2
src/Ryujinx.HLE/Debugger/Gdb/CommandProcessor.cs
View File

@ -181,7 +181,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
if (ss.ConsumeRemaining("fThreadInfo"))
{
Reply(
$"m{Debugger.DebugProcess.ThreadUids.Select(x => $"{x:x}").JoinToString(",")}");
$"m{DebugProcess.ThreadUids.Select(x => $"{x:x}").JoinToString(",")}");
break;
}

60
src/Ryujinx.HLE/Debugger/Gdb/Commands.cs
View File

@ -37,33 +37,33 @@ namespace Ryujinx.HLE.Debugger.Gdb
{
// GDB is performing initial contact. Stop everything.
Debugger.DebugProcess.DebugStop();
Debugger.GThread = Debugger.CThread = Debugger.DebugProcess.ThreadUids.First();
Processor.Reply($"T05thread:{Debugger.CThread:x};");
Debugger.GThreadId = Debugger.CThreadId = Debugger.DebugProcess.ThreadUids.First();
Processor.Reply($"T05thread:{Debugger.CThreadId:x};");
}
internal void Interrupt()
{
// GDB is requesting an interrupt. Stop everything.
Debugger.DebugProcess.DebugStop();
if (Debugger.GThread == null || Debugger.GetThreads().All(x => x.ThreadUid != Debugger.GThread.Value))
if (Debugger.GThreadId == null || Debugger.GetThreads().All(x => x.ThreadUid != Debugger.GThreadId.Value))
{
Debugger.GThread = Debugger.CThread = Debugger.DebugProcess.ThreadUids.First();
Debugger.GThreadId = Debugger.CThreadId = Debugger.DebugProcess.ThreadUids.First();
}
Processor.Reply($"T02thread:{Debugger.GThread:x};");
Processor.Reply($"T02thread:{Debugger.GThreadId:x};");
}
internal void Continue(ulong? newPc)
{
if (newPc.HasValue)
{
if (Debugger.CThread == null)
if (Debugger.CThreadId == null)
{
Processor.ReplyError();
return;
}
Debugger.DebugProcess.GetThread(Debugger.CThread.Value).Context.DebugPc = newPc.Value;
Debugger.CThread.Context.DebugPc = newPc.Value;
}
Debugger.DebugProcess.DebugContinue();
@ -78,13 +78,13 @@ namespace Ryujinx.HLE.Debugger.Gdb
internal void ReadRegisters()
{
if (Debugger.GThread == null)
if (Debugger.GThreadId == null)
{
Processor.ReplyError();
return;
}
IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
IExecutionContext ctx = Debugger.GThread.Context;
string registers = string.Empty;
if (Debugger.IsProcess32Bit)
{
@ -106,13 +106,13 @@ namespace Ryujinx.HLE.Debugger.Gdb
internal void WriteRegisters(StringStream ss)
{
if (Debugger.GThread == null)
if (Debugger.GThreadId == null)
{
Processor.ReplyError();
return;
}
IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
IExecutionContext ctx = Debugger.GThread.Context;
if (Debugger.IsProcess32Bit)
{
for (int i = 0; i < GdbRegisters.Count32; i++)
@ -162,11 +162,11 @@ namespace Ryujinx.HLE.Debugger.Gdb
switch (op)
{
case 'c':
Debugger.CThread = threadId;
Debugger.CThreadId = threadId;
Processor.ReplyOK();
return;
case 'g':
Debugger.GThread = threadId;
Debugger.GThreadId = threadId;
Processor.ReplyOK();
return;
default:
@ -214,13 +214,13 @@ namespace Ryujinx.HLE.Debugger.Gdb
internal void ReadRegister(int gdbRegId)
{
if (Debugger.GThread == null)
if (Debugger.GThreadId == null)
{
Processor.ReplyError();
return;
}
IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
IExecutionContext ctx = Debugger.GThread.Context;
string result = Debugger.ReadRegister(ctx, gdbRegId);
Processor.Reply(result != null, result);
@ -228,26 +228,26 @@ namespace Ryujinx.HLE.Debugger.Gdb
internal void WriteRegister(int gdbRegId, StringStream ss)
{
if (Debugger.GThread == null)
if (Debugger.GThreadId == null)
{
Processor.ReplyError();
return;
}
IExecutionContext ctx = Debugger.DebugProcess.GetThread(Debugger.GThread.Value).Context;
Processor.Reply(Debugger.WriteRegister(ctx, gdbRegId, ss) && ss.IsEmpty);
Processor.Reply(
success: Debugger.WriteRegister(Debugger.GThread.Context, gdbRegId, ss) && ss.IsEmpty
);
}
internal void Step(ulong? newPc)
{
if (Debugger.CThread == null)
if (Debugger.CThreadId == null)
{
Processor.ReplyError();
return;
}
KThread thread = Debugger.DebugProcess.GetThread(Debugger.CThread.Value);
KThread thread = Debugger.CThread;
if (newPc.HasValue)
{
@ -260,7 +260,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
}
else
{
Debugger.GThread = Debugger.CThread = thread.ThreadUid;
Debugger.GThreadId = Debugger.CThreadId = thread.ThreadUid;
Processor.Reply($"T05thread:{thread.ThreadUid:x};");
}
}
@ -314,7 +314,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
_ => VContAction.None
};
// Note: We don't support signals yet.
// TODO: Note: We don't support signals yet.
//ushort? signal = null;
if (cmd is 'C' or 'S')
{
@ -323,24 +323,22 @@ namespace Ryujinx.HLE.Debugger.Gdb
// since that method advances the underlying string position
}
ulong? threadId = null;
if (stream.ConsumePrefix(":"))
{
threadId = stream.ReadRemainingAsThreadUid();
}
ulong? threadId = stream.ConsumePrefix(":")
? stream.ReadRemainingAsThreadUid()
: null;
if (threadId.HasValue)
{
if (threadActionMap.ContainsKey(threadId.Value))
{
threadActionMap[threadId.Value] = new VContPendingAction(action/*, signal*/);
threadActionMap[threadId.Value] = new VContPendingAction(action /*, signal*/);
}
}
else
{
foreach (ulong thread in threadActionMap.Keys)
{
threadActionMap[thread] = new VContPendingAction(action/*, signal*/);
threadActionMap[thread] = new VContPendingAction(action /*, signal*/);
}
if (action == VContAction.Continue)
@ -393,7 +391,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
{
if (action.Action == VContAction.Step)
{
Debugger.GThread = Debugger.CThread = threadUid;
Debugger.GThreadId = Debugger.CThreadId = threadUid;
Processor.Reply($"T05thread:{threadUid:x};");
}
}

8
src/Ryujinx.HLE/Debugger/Gdb/Registers.cs
View File

@ -16,6 +16,8 @@ namespace Ryujinx.HLE.Debugger.Gdb
*/
private const uint FpcrMask = 0xfc1fffff;
#region 64-bit
public static string ReadRegister64(this IExecutionContext state, int registerId) =>
registerId switch
{
@ -74,6 +76,10 @@ namespace Ryujinx.HLE.Debugger.Gdb
}
}
#endregion
#region 32-bit
public static string ReadRegister32(this IExecutionContext state, int registerId)
{
switch (registerId)
@ -149,5 +155,7 @@ namespace Ryujinx.HLE.Debugger.Gdb
return false;
}
}
#endregion
}
}

4
src/Ryujinx.HLE/Debugger/Message.cs
View File

@ -26,9 +26,7 @@ namespace Ryujinx.HLE.Debugger
public readonly string Command;
public CommandMessage(string cmd)
{
Command = cmd;
}
=> Command = cmd;
}
public class ThreadBreakMessage : Message.IMarker

2
src/Ryujinx.HLE/Debugger/RegisterInformation.cs
View File

@ -3,7 +3,7 @@ using System.IO;
namespace Ryujinx.HLE.Debugger
{
class RegisterInformation
static class RegisterInformation
{
public static readonly Dictionary<string, string> Features = new()
{

2
src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs
View File

@ -889,7 +889,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
[Svc(1)]
public Result SetHeapSize([PointerSized] out ulong address, [PointerSized] ulong size)
{
if ((size & 0xfffffffd001fffff) != 0)
if ((size & 0xfffffffc001fffff) != 0)
{
address = 0;

5
src/Ryujinx/Program.cs
View File

@ -221,10 +221,7 @@ namespace Ryujinx.Ava
}
// When you first load the program, copy to remember the path for the global configuration
if (GlobalConfigurationPath == null)
{
GlobalConfigurationPath = ConfigurationPath;
}
GlobalConfigurationPath ??= ConfigurationPath;
UseHardwareAcceleration = ConfigurationState.Instance.EnableHardwareAcceleration;

6
src/Ryujinx/Ryujinx.csproj
View File

@ -51,10 +51,10 @@
<PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Avalonia.Controls.DataGrid" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" />
<PackageReference Include="Avalonia.Svg" />
<PackageReference Include="Avalonia.Svg.Skia" />
<PackageReference Include="Svg.Controls.Avalonia" />
<PackageReference Include="Svg.Controls.Skia.Avalonia" />
<PackageReference Include="DynamicData" />
<PackageReference Include="FluentAvaloniaUI" />
<PackageReference Include="FluentAvaloniaUI.NoAnim" />
<PackageReference Include="CommandLineParser" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="DiscordRichPresence" />

4
src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs
View File

@ -318,9 +318,9 @@ namespace Ryujinx.Ava.Systems.AppLibrary
}
catch (HorizonResultException)
{
foreach (DirectoryEntryEx entry in controlFs.EnumerateEntries("/", "*"))
foreach (DirectoryEntryEx entry in controlFs.EnumerateEntries("/", "*", SearchOptions.Default))
{
if (entry.Name == "control.nacp")
if (entry.Name == "control.nacp" || entry.Type == DirectoryEntryType.Directory)
{
continue;
}

1
src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs
View File

@ -56,6 +56,7 @@ namespace Ryujinx.Ava.Systems.Configuration
Logger.EnableFileLog.Value = cff.EnableFileLog;
Logger.EnableDebug.Value = cff.LoggingEnableDebug;
Logger.EnableAvaloniaLog.Value = cff.LoggingEnableAvalonia;
Logger.EnableStub.Value = cff.LoggingEnableStub;
Logger.EnableInfo.Value = cff.LoggingEnableInfo;
Logger.EnableWarn.Value = cff.LoggingEnableWarn;

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

@ -35,18 +35,17 @@
Width="350"
ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
HorizontalContentAlignment="Left">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
</ComboBoxItem>
<ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
</ComboBoxItem>
<ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
</ComboBoxItem>
<ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
<ComboBoxItem
IsEnabled="{Binding IsOpenAlEnabled}"
Content="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
<ComboBoxItem
IsEnabled="{Binding IsSoundIoEnabled}"
Content="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
<ComboBoxItem
IsEnabled="{Binding IsSDL2Enabled}"
Content="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
</ComboBox>
</StackPanel>
<StackPanel Margin="10,0,0,0" Orientation="Horizontal">

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

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

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

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

21
src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
View File

@ -101,19 +101,14 @@
Width="150"
HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale OpenGlLogLevel}">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock
Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
</ComboBox>
</StackPanel>
</StackPanel>

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

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

170
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
View File

@ -42,27 +42,20 @@
SelectedIndex="{Binding Region}"
HorizontalContentAlignment="Left"
Width="350">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
<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
@ -76,60 +69,42 @@
SelectedIndex="{Binding Language}"
HorizontalContentAlignment="Left"
Width="350">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
</ComboBoxItem>
<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
@ -208,15 +183,12 @@
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltipCustom}"
HorizontalContentAlignment="Left"
Width="350">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
</ComboBox>
<ComboBox
IsVisible="{Binding !EnableCustomVSyncInterval}"
@ -224,12 +196,10 @@
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
HorizontalContentAlignment="Left"
Width="350">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBox>
</StackPanel>
<StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@ -288,18 +258,14 @@
ToolTip.Tip="{ext:Locale DRamTooltip}"
HorizontalContentAlignment="Left"
Width="350">
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize4GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize6GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize8GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemDramSize4GiB}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemDramSize6GiB}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemDramSize8GiB}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBox>
</StackPanel>
<StackPanel

72
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View File

@ -71,22 +71,16 @@
<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>
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
</ComboBox>
</StackPanel>
<StackPanel
@ -100,16 +94,12 @@
<ComboBox SelectedIndex="{Binding UpdateCheckerType}"
HorizontalContentAlignment="Left"
MinWidth="100">
<ComboBoxItem>
<TextBlock Text="{ext:Locale CommonOff}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock
Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale CommonOff}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
</ComboBox>
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel>
@ -122,15 +112,12 @@
<ComboBox SelectedIndex="{Binding HideCursor}"
HorizontalContentAlignment="Left"
MinWidth="100">
<ComboBoxItem>
<TextBlock Text="{ext:Locale Never}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale Never}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
</ComboBox>
</StackPanel>
<StackPanel
@ -145,15 +132,12 @@
<ComboBox SelectedIndex="{Binding BaseStyleIndex}"
HorizontalContentAlignment="Left"
MinWidth="100">
<ComboBoxItem>
<TextBlock Text="{ext:Locale CommonAuto}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
</ComboBoxItem>
<ComboBoxItem
Content="{ext:Locale CommonAuto}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralThemeLight}" />
<ComboBoxItem
Content="{ext:Locale SettingsTabGeneralThemeDark}" />
</ComboBox>
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel>