diff --git a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs index 57e94483b4..6ee79a371c 100644 --- a/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs @@ -54,7 +54,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input } } - public InputViewModel ParentModel { get; } + public readonly InputViewModel ParentModel; public ControllerInputViewModel(InputViewModel model, GamepadInputConfig config) { diff --git a/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs index bbaa199332..0b530eb094 100644 --- a/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs @@ -53,11 +53,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input } } - private readonly InputViewModel _parentModel; + public readonly InputViewModel ParentModel; public KeyboardInputViewModel(InputViewModel model, KeyboardInputConfig config) { - _parentModel = model; + ParentModel = model; model.NotifyChangesEvent += OnParentModelChanged; OnParentModelChanged(); Config = config; @@ -65,9 +65,9 @@ namespace Ryujinx.Ava.UI.ViewModels.Input public void OnParentModelChanged() { - IsLeft = _parentModel.IsLeft; - IsRight = _parentModel.IsRight; - Image = _parentModel.Image; + IsLeft = ParentModel.IsLeft; + IsRight = ParentModel.IsRight; + Image = ParentModel.Image; } } } diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs index 635f00892d..f17c7496ca 100644 --- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs +++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs @@ -60,7 +60,7 @@ namespace Ryujinx.Ava.UI.Views.Input 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(); _currentAssigner.ButtonAssigned += (sender, e) => @@ -68,7 +68,7 @@ namespace Ryujinx.Ava.UI.Views.Input if (e.ButtonValue.HasValue) { var buttonValue = e.ButtonValue.Value; - viewModel.parentModel.IsModified = true; + viewModel.ParentModel.IsModified = true; switch (button.Name) { @@ -193,7 +193,7 @@ namespace Ryujinx.Ava.UI.Views.Input { IButtonAssigner assigner; - assigner = new KeyboardKeyAssigner((IKeyboard)(DataContext as KeyboardInputViewModel).parentModel.SelectedGamepad); + assigner = new KeyboardKeyAssigner((IKeyboard)(DataContext as KeyboardInputViewModel).ParentModel.SelectedGamepad); return assigner; }