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

misc: chore: Replace Gommon functions with standard .NET equivalents (part 3)

Browse source
This commit is contained in:
KeatonTheBot 2025-09-04 10:46:11 -05:00
parent 17946c78e6
commit 9addccb50f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx/App.axaml.cs
View file

@ -5,7 +5,7 @@ using Avalonia.Markup.Xaml;
using Avalonia.Platform; using Avalonia.Platform;
using Avalonia.Styling; using Avalonia.Styling;
using Avalonia.Threading; using Avalonia.Threading;
using Gommon; using CommandLine;
using Ryujinx.Ava.Common; using Ryujinx.Ava.Common;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Helpers;

7
src/Ryujinx/Headless/Options.cs
View file

@ -1,5 +1,4 @@
using CommandLine; using CommandLine;
using Gommon;
using Ryujinx.Common.Configuration; using Ryujinx.Common.Configuration;
using Ryujinx.HLE; using Ryujinx.HLE;
using Ryujinx.HLE.HOS.SystemState; using Ryujinx.HLE.HOS.SystemState;
@ -149,8 +148,10 @@ namespace Ryujinx.Headless
IgnoreControllerApplet = configurationState.IgnoreControllerApplet; IgnoreControllerApplet = configurationState.IgnoreControllerApplet;
return; return;
bool NeedsOverride(string argKey) => originalArgs.None(arg => arg.TrimStart('-').EqualsIgnoreCase(OptionName(argKey))); bool NeedsOverride(string argKey) =>
argKey != null && originalArgs.None(arg =>
arg.TrimStart('-').Equals(OptionName(argKey), StringComparison.OrdinalIgnoreCase));
string OptionName(string propertyName) => string OptionName(string propertyName) =>
typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName; typeof(Options)!.GetProperty(propertyName)!.GetCustomAttribute<OptionAttribute>()!.LongName;

3
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -8,7 +8,6 @@ using Avalonia.Threading;
using DynamicData; using DynamicData;
using DynamicData.Binding; using DynamicData.Binding;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Gommon;
using LibHac.Common; using LibHac.Common;
using Ryujinx.Ava.Common; using Ryujinx.Ava.Common;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
@ -1571,7 +1570,7 @@ namespace Ryujinx.Ava.UI.ViewModels
VolumeStatusText = args.VolumeStatus; VolumeStatusText = args.VolumeStatus;
FifoStatusText = args.FifoStatus; FifoStatusText = args.FifoStatus;
ShaderCountText = args.ShaderCount > 0 ? $"Compiling shaders: {args.ShaderCount}" : string.Empty; ShaderCountText = args.ShaderCount > 0 ? $"Compiling shaders: {args.ShaderCount}" : string.Empty;
ShowRightmostSeparator = !ShaderCountText.IsNullOrEmpty(); ShowRightmostSeparator = !string.IsNullOrEmpty(ShaderCountText);
ShowStatusSeparator = true; ShowStatusSeparator = true;
}); });