From 8dc6c57af2788ef9f86c12c82325b6695b44b152 Mon Sep 17 00:00:00 2001 From: Emyka Date: Wed, 21 Dec 2022 20:10:07 +0000 Subject: [PATCH 1/3] Move PurposesCategories static generation in GeneratePurposesCategories(), called on Init --- Ktisis/Interface/Input.cs | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Ktisis/Interface/Input.cs b/Ktisis/Interface/Input.cs index 27f6438d7..e6f6be542 100644 --- a/Ktisis/Interface/Input.cs +++ b/Ktisis/Interface/Input.cs @@ -177,6 +177,7 @@ public enum Purpose { // Init & dispose public static void Init() { + GeneratePurposesCategories(); EventManager.OnKeyPressed += OnKeyPressed; EventManager.OnKeyReleased += OnKeyReleased; } @@ -202,25 +203,23 @@ public static IEnumerable Purposes { public static IEnumerable PurposesWithCategories { get { - var purposesWithCategories = Enum.GetValues().ToList(); - - int i = FirstCategoryPurposeHold; // start of categories in Purpose enum - foreach (var category in Category.Categories) { - PurposesCategories.TryAdd((Purpose)i, category.Value); - PurposesCategoriesHold.TryAdd((Purpose)i, category.Value); - purposesWithCategories.Add((Purpose)i); - i++; - } + return Enum.GetValues().Concat(PurposesCategories.Keys).ToList(); + } + } + public static void GeneratePurposesCategories() { - i = FirstCategoryPurposeToggle; // start of categories in Purpose enum - foreach (var category in Category.Categories) { - PurposesCategories.TryAdd((Purpose)i, category.Value); - PurposesCategoriesToggle.TryAdd((Purpose)i, category.Value); - purposesWithCategories.Add((Purpose)i); - i++; - } + int i = FirstCategoryPurposeHold; // start of categories in Purpose enum + foreach (var category in Category.Categories) { + PurposesCategories.TryAdd((Purpose)i, category.Value); + PurposesCategoriesHold.TryAdd((Purpose)i, category.Value); + i++; + } - return purposesWithCategories; + i = FirstCategoryPurposeToggle; // start of categories in Purpose enum + foreach (var category in Category.Categories) { + PurposesCategories.TryAdd((Purpose)i, category.Value); + PurposesCategoriesToggle.TryAdd((Purpose)i, category.Value); + i++; } } From 7c7c47469a0d81d3e1f49bf515d6282494402980 Mon Sep 17 00:00:00 2001 From: Emyka Date: Wed, 21 Dec 2022 21:31:45 +0000 Subject: [PATCH 2/3] Simplified PurposesWithCategories code style --- Ktisis/Interface/Input.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Ktisis/Interface/Input.cs b/Ktisis/Interface/Input.cs index e6f6be542..939cd7974 100644 --- a/Ktisis/Interface/Input.cs +++ b/Ktisis/Interface/Input.cs @@ -201,11 +201,9 @@ public static IEnumerable Purposes { get => Enum.GetValues().ToImmutableList(); } - public static IEnumerable PurposesWithCategories { - get { - return Enum.GetValues().Concat(PurposesCategories.Keys).ToList(); - } - } + public static IEnumerable PurposesWithCategories => + Enum.GetValues().Concat(PurposesCategories.Keys).ToList(); + public static void GeneratePurposesCategories() { int i = FirstCategoryPurposeHold; // start of categories in Purpose enum From b2056092e1893873e8f8143e2c60d0cd6d13e78a Mon Sep 17 00:00:00 2001 From: Emyka Date: Wed, 21 Dec 2022 21:32:33 +0000 Subject: [PATCH 3/3] Changed GeneratePurposesCategories to private --- Ktisis/Interface/Input.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ktisis/Interface/Input.cs b/Ktisis/Interface/Input.cs index 939cd7974..a8bf0ae54 100644 --- a/Ktisis/Interface/Input.cs +++ b/Ktisis/Interface/Input.cs @@ -204,7 +204,7 @@ public static IEnumerable Purposes { public static IEnumerable PurposesWithCategories => Enum.GetValues().Concat(PurposesCategories.Keys).ToList(); - public static void GeneratePurposesCategories() { + private static void GeneratePurposesCategories() { int i = FirstCategoryPurposeHold; // start of categories in Purpose enum foreach (var category in Category.Categories) {