From c9bc4eaf58ca0d693a37b1229bb6fc210ce71474 Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:37:27 +0200 Subject: Fix missing string enum converters for the config (#4634) * 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. --- Ryujinx.Common/Configuration/Hid/Controller/GamepadInputId.cs | 8 ++++++-- Ryujinx.Common/Configuration/Hid/Controller/StickInputId.cs | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'Ryujinx.Common/Configuration/Hid/Controller') 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))] 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))] public enum StickInputId : byte { Unbound, @@ -8,4 +12,4 @@ Count } -} +} \ No newline at end of file -- cgit v1.2.3