manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-10 12:49:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove redundant property

Browse source
This commit is contained in:
Isaac Marovitz 2023-09-19 10:52:02 -04:00 committed by Isaac Marovitz
parent a0a74d3d10
commit a6c066ea38
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
View file

@ -12,13 +12,11 @@ namespace Ryujinx.Ava.UI.Helpers
internal class ButtonAssignedEventArgs : EventArgs internal class ButtonAssignedEventArgs : EventArgs
{ {
public ToggleButton Button { get; } public ToggleButton Button { get; }
public bool IsAssigned { get; }
public ButtonValue? ButtonValue { get; } public ButtonValue? ButtonValue { get; }
public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned, ButtonValue? buttonValue) public ButtonAssignedEventArgs(ToggleButton button, ButtonValue? buttonValue)
{ {
Button = button; Button = button;
IsAssigned = isAssigned;
ButtonValue = buttonValue; ButtonValue = buttonValue;
} }
} }
@ -89,7 +87,7 @@ namespace Ryujinx.Ava.UI.Helpers
ToggledButton.IsChecked = false; ToggledButton.IsChecked = false;
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton.HasValue, pressedButton)); ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
}); });
} }

2
src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml.cs
View file

@ -65,7 +65,7 @@ namespace Ryujinx.Ava.UI.Views.Input
_currentAssigner.ButtonAssigned += (sender, e) => _currentAssigner.ButtonAssigned += (sender, e) =>
{ {
if (e.IsAssigned) if (e.ButtonValue.HasValue)
{ {
var viewModel = (DataContext as ControllerInputViewModel); var viewModel = (DataContext as ControllerInputViewModel);
var buttonValue = e.ButtonValue.Value; var buttonValue = e.ButtonValue.Value;

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

@ -64,7 +64,7 @@ namespace Ryujinx.Ava.UI.Views.Input
_currentAssigner.ButtonAssigned += (sender, e) => _currentAssigner.ButtonAssigned += (sender, e) =>
{ {
if (e.IsAssigned) if (e.ButtonValue.HasValue)
{ {
var viewModel = (DataContext as KeyboardInputViewModel); var viewModel = (DataContext as KeyboardInputViewModel);
var buttonValue = e.ButtonValue.Value; var buttonValue = e.ButtonValue.Value;