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

Fix rebase errors

Browse source
This commit is contained in:
Isaac Marovitz 2023-05-19 13:04:15 -04:00 committed by Isaac Marovitz
parent b9cf223d86
commit 9bbee3041e
4 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Ava/UI/ViewModels/Input/MotionInputViewModel.cs
View file

@ -1,4 +1,4 @@
namespace Ryujinx.Ava.UI.ViewModels namespace Ryujinx.Ava.UI.ViewModels.Input
{ {
public class MotionInputViewModel : BaseModel public class MotionInputViewModel : BaseModel
{ {

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

@ -9,7 +9,6 @@ using Ryujinx.Ava.UI.ViewModels.Input;
using Ryujinx.Common.Configuration.Hid.Controller; using Ryujinx.Common.Configuration.Hid.Controller;
using Ryujinx.Input; using Ryujinx.Input;
using Ryujinx.Input.Assigner; using Ryujinx.Input.Assigner;
using System;
using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId; using StickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
namespace Ryujinx.Ava.UI.Views.Input namespace Ryujinx.Ava.UI.Views.Input

8
src/Ryujinx.Ava/UI/Views/Input/MotionInputView.axaml.cs
View file

@ -1,9 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Models; using Ryujinx.Ava.UI.ViewModels.Input;
using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Common.Configuration.Hid.Controller;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Views.Input namespace Ryujinx.Ava.UI.Views.Input
@ -19,7 +17,7 @@ namespace Ryujinx.Ava.UI.Views.Input
public MotionInputView(ControllerInputViewModel viewModel) public MotionInputView(ControllerInputViewModel viewModel)
{ {
var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>; var config = viewModel.Config;
_viewModel = new MotionInputViewModel _viewModel = new MotionInputViewModel
{ {
@ -51,7 +49,7 @@ namespace Ryujinx.Ava.UI.Views.Input
}; };
contentDialog.PrimaryButtonClick += (sender, args) => contentDialog.PrimaryButtonClick += (sender, args) =>
{ {
var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>; var config = viewModel.Config;
config.Slot = content._viewModel.Slot; config.Slot = content._viewModel.Slot;
config.Sensitivity = content._viewModel.Sensitivity; config.Sensitivity = content._viewModel.Sensitivity;
config.GyroDeadzone = content._viewModel.GyroDeadzone; config.GyroDeadzone = content._viewModel.GyroDeadzone;

8
src/Ryujinx.Ava/UI/Views/Input/RumbleInputView.axaml.cs
View file

@ -1,9 +1,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using FluentAvalonia.UI.Controls; using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale; using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.UI.Models; using Ryujinx.Ava.UI.ViewModels.Input;
using Ryujinx.Ava.UI.ViewModels;
using Ryujinx.Common.Configuration.Hid.Controller;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Views.Input namespace Ryujinx.Ava.UI.Views.Input
@ -19,7 +17,7 @@ namespace Ryujinx.Ava.UI.Views.Input
public RumbleInputView(ControllerInputViewModel viewModel) public RumbleInputView(ControllerInputViewModel viewModel)
{ {
var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>; var config = viewModel.Config;
_viewModel = new RumbleInputViewModel _viewModel = new RumbleInputViewModel
{ {
@ -47,7 +45,7 @@ namespace Ryujinx.Ava.UI.Views.Input
contentDialog.PrimaryButtonClick += (sender, args) => contentDialog.PrimaryButtonClick += (sender, args) =>
{ {
var config = viewModel.Configuration as InputConfiguration<GamepadInputId, StickInputId>; var config = viewModel.Config;
config.StrongRumble = content._viewModel.StrongRumble; config.StrongRumble = content._viewModel.StrongRumble;
config.WeakRumble = content._viewModel.WeakRumble; config.WeakRumble = content._viewModel.WeakRumble;
}; };