MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Feature: Auto-Assign Controllers #706

Open
uncavo-hdmi wants to merge 31 commits from uncavo-hdmi/auto-assign-controller into master
pull from: uncavo-hdmi/auto-assign-controller
merge into: MeloNX:master
Conversation 5 Commits 31 Files Changed 19 +5 -7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc905280cd - Show all commits

1
src/Ryujinx/Input/ControllerAssignmentManager.cs
View File

@ -140,6 +140,7 @@ namespace Ryujinx.Ava.Input
if (orderedConfigs[index] is StandardControllerInputConfig standardConfig) if (orderedConfigs[index] is StandardControllerInputConfig standardConfig)
{ {
if(standardConfig.Led.UseRainbow) continue;
Logger.Warning?.Print(LogClass.Application, $"Setting color for Player{index + 1}"); Logger.Warning?.Print(LogClass.Application, $"Setting color for Player{index + 1}");
standardConfig.Led = new LedConfigController standardConfig.Led = new LedConfigController
{ {

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

@ -387,18 +387,15 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
{ {
if (ConfigViewModel is not ControllerInputViewModel controllerInputViewModel) return; if (ConfigViewModel is not ControllerInputViewModel controllerInputViewModel) return;
GamepadInputConfig inputConfig = controllerInputViewModel.Config; GamepadInputConfig inputConfig = controllerInputViewModel.Config;
if (inputConfig is not { EnableLedChanging: true }) return; if (inputConfig is not { EnableLedChanging: true }) return;
if (inputConfig.TurnOffLed) if (inputConfig.TurnOffLed)
{ {
SelectedGamepad.ClearLed(); SelectedGamepad.ClearLed();
}
else if(inputConfig.UseRainbowLed)
{
SelectedGamepad.SetLed((uint)Rainbow.Color.ToArgb());
} }
else
if (!inputConfig.TurnOffLed && !inputConfig.UseRainbowLed)
{ {
SelectedGamepad.SetLed(inputConfig.LedColor.ToUInt32()); SelectedGamepad.SetLed(inputConfig.LedColor.ToUInt32());
} }