mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build

Browse source
This commit is contained in:
Isaac Marovitz 2024-04-05 13:17:43 -04:00
commit 22496c7524
No known key found for this signature in database
GPG key ID: 97250B2B09A132E1
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs
View file

@ -54,7 +54,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
} }
} }
public InputViewModel ParentModel { get; } public readonly InputViewModel ParentModel;
public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config) public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config)
{ {

10
src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs
View file

@ -53,11 +53,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
} }
} }
private readonly InputViewModel _parentModel; public readonly InputViewModel ParentModel;
public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config) public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config)
{ {
_parentModel = model; ParentModel = model;
model.NotifyChangesEvent += OnParentModelChanged; model.NotifyChangesEvent += OnParentModelChanged;
OnParentModelChanged(); OnParentModelChanged();
Config = config; Config = config;
@ -65,9 +65,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
public void OnParentModelChanged() public void OnParentModelChanged()
{ {
IsLeft = _parentModel.IsLeft; IsLeft = ParentModel.IsLeft;
IsRight = _parentModel.IsRight; IsRight = ParentModel.IsRight;
Image = _parentModel.Image; Image = ParentModel.Image;
} }
} }
} }

6
src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
View file

@ -60,7 +60,7 @@ namespace Ryujinx.Ava.UI.Views.Input
var viewModel = (DataContext as KeyboardInputViewModel); var viewModel = (DataContext as KeyboardInputViewModel);
IKeyboard keyboard = (IKeyboard)viewModel.parentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations. IKeyboard keyboard = (IKeyboard)viewModel.ParentModel.AvaloniaKeyboardDriver.GetGamepad("0"); // Open Avalonia keyboard for cancel operations.
IButtonAssigner assigner = CreateButtonAssigner(); IButtonAssigner assigner = CreateButtonAssigner();
_currentAssigner.ButtonAssigned += (sender, e) => _currentAssigner.ButtonAssigned += (sender, e) =>
@ -68,7 +68,7 @@ namespace Ryujinx.Ava.UI.Views.Input
if (e.ButtonValue.HasValue) if (e.ButtonValue.HasValue)
{ {
var buttonValue = e.ButtonValue.Value; var buttonValue = e.ButtonValue.Value;
viewModel.parentModel.IsModified = true; viewModel.ParentModel.IsModified = true;
switch (button.Name) switch (button.Name)
{ {
@ -193,7 +193,7 @@ namespace Ryujinx.Ava.UI.Views.Input
{ {
IButtonAssigner assigner; IButtonAssigner assigner;
assigner = new KeyboardKeyAssigner((IKeyboard)(DataContext as KeyboardInputViewModel).parentModel.SelectedGamepad); assigner = new KeyboardKeyAssigner((IKeyboard)(DataContext as KeyboardInputViewModel).ParentModel.SelectedGamepad);
return assigner; return assigner;
} }