mchapman/Ryujinx-greemdev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'DeadZone' into joycon

Browse Source 
# Conflicts:
#	src/Ryujinx/Ryujinx.csproj
This commit is contained in:
madwind
2025-01-08 10:13:47 +08:00
parent 672f5df0f9 270c5bd815
commit 6d5dd49550
13 changed files with 737 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
private const string Disabled = "disabled";
private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
private const string JoyConPairResource = "Ryujinx/Assets/Icons/Controller_JoyConPair.svg";
private const string JoyConLeftResource = "Ryujinx/Assets/Icons/Controller_JoyConLeft.svg";
private const string JoyConRightResource = "Ryujinx/Assets/Icons/Controller_JoyConRight.svg";
private const string JoyConLeftResource = "Ryujinx/Assets/Icons/Controller_JoyConLeft_Settings.svg";
private const string JoyConRightResource = "Ryujinx/Assets/Icons/Controller_JoyConRight_Settings.svg";
private const string KeyboardString = "keyboard";
private const string ControllerString = "controller";
private readonly MainWindow _mainWindow;