emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix missing string enum converters for the config (#4634)

Browse source 
* Fix missing string enum converters for the config

* Revert changing KeyboardHotkeys to struct

This needs to be done because
Avalonia's TwoWay Binding breaks otherwise.
This commit is contained in:
TSRBerry 2023-04-03 15:37:27 +02:00 committed by GitHub
parent 3249f8ff41
commit c9bc4eaf58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs
View file

@ -1,5 +1,9 @@
namespace Ryujinx.Common.Configuration.Hid.Controller using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid.Controller
{ {
[JsonConverter(typeof(TypedStringEnumConverter<GamepadInputId>))]
public enum GamepadInputId : byte public enum GamepadInputId : byte
{ {
Unbound, Unbound,
@ -51,4 +55,4 @@
Count Count
} }
} }

8
Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs
View file

@ -1,5 +1,9 @@
namespace Ryujinx.Common.Configuration.Hid.Controller using Ryujinx.Common.Utilities;
using System.Text.Json.Serialization;
namespace Ryujinx.Common.Configuration.Hid.Controller
{ {
[JsonConverter(typeof(TypedStringEnumConverter<StickInputId>))]
public enum StickInputId : byte public enum StickInputId : byte
{ {
Unbound, Unbound,
@ -8,4 +12,4 @@
Count Count
} }
} }

4
Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
View file

@ -1,6 +1,8 @@
namespace Ryujinx.Common.Configuration.Hid namespace Ryujinx.Common.Configuration.Hid
{ {
public struct KeyboardHotkeys // NOTE: Please don't change this to struct.
// This breaks Avalonia's TwoWay binding, which makes us unable to save new KeyboardHotkeys.
public class KeyboardHotkeys
{ {
public Key ToggleVsync { get; set; } public Key ToggleVsync { get; set; }
public Key Screenshot { get; set; } public Key Screenshot { get; set; }