JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-09 13:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Neo
2025-11-01 05:21:36 -05:00
parent c0cc54cc56 2c9b193018
commit 18233cf7e6
47 changed files with 714 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ryujinx/UI/Applet/ProfileSelectorDialog.axaml.cs
View File

@@ -18,6 +18,12 @@ namespace Ryujinx.Ava.UI.Applet
{
public partial class ProfileSelectorDialog : RyujinxControl<ProfileSelectorDialogViewModel>
{
//Fix compiler warning
public ProfileSelectorDialog()
{
}
public ProfileSelectorDialog(ProfileSelectorDialogViewModel viewModel)
{
DataContext = ViewModel = viewModel;

2
src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
View File

@@ -95,7 +95,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
public bool IsRight { get; set; }
public bool IsLeft { get; set; }
public string RevertDeviceId { get; set; }
public bool HasLed => SelectedGamepad.Features.HasFlag(GamepadFeaturesFlag.Led);
public bool HasLed => (SelectedGamepad.Features & GamepadFeaturesFlag.Led) != 0;
public bool CanClearLed => SelectedGamepad.Name.ContainsIgnoreCase("DualSense");
public event Action NotifyChangesEvent;

6
src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
View File

@@ -10,6 +10,12 @@ namespace Ryujinx.UI.Views.Input
{
public partial class LedInputView : RyujinxControl<LedInputViewModel>
{
//Fix compiler warning
public LedInputView()
{
}
public LedInputView(ControllerInputViewModel viewModel)
{
ViewModel = new LedInputViewModel

6
src/Ryujinx/UI/Windows/GameSpecificSettingsWindow.axaml.cs
View File

@@ -11,6 +11,12 @@ namespace Ryujinx.Ava.UI.Windows
{
internal readonly SettingsViewModel ViewModel;
//Fix compiler warning
public GameSpecificSettingsWindow()
{
}
public GameSpecificSettingsWindow(MainWindowViewModel viewModel, bool findUserConfigDir = true)
{
Title = string.Format(LocaleManager.Instance[LocaleKeys.SettingsWithInfo], viewModel.SelectedApplication.Name, viewModel.SelectedApplication.IdString);