diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-04-03 15:37:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 15:37:27 +0200 |
| commit | c9bc4eaf58ca0d693a37b1229bb6fc210ce71474 (patch) | |
| tree | 7ac29a29fcbb646609d5a8ef8d768ee88d24b9e7 | |
| parent | 3249f8ff41446b47cf458bbc04f8c27e005889aa (diff) | |
Fix missing string enum converters for the config (#4634)1.1.694
* 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.
3 files changed, 15 insertions, 5 deletions
diff --git a/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs index cae65fc9..ad1fa667 100644 --- a/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs +++ b/Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs @@ -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 { Unbound, @@ -51,4 +55,4 @@ Count } -} +}
\ No newline at end of file diff --git a/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs b/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs index 87945a75..5fc4d1c8 100644 --- a/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs +++ b/Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs @@ -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 { Unbound, @@ -8,4 +12,4 @@ Count } -} +}
\ No newline at end of file diff --git a/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs b/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs index 8b6c8c14..1a10c2a5 100644 --- a/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs +++ b/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs @@ -1,6 +1,8 @@ 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 Screenshot { get; set; } |