Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Generate category hotkeys on init #91

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix: Generate category hotkeys on init #91

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dc6c57
Move PurposesCategories static generation in GeneratePurposesCategori…
emyxiv Dec 21, 2022
7c7c474
Simplified PurposesWithCategories code style
emyxiv Dec 21, 2022
b205609
Changed GeneratePurposesCategories to private
emyxiv Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions Ktisis/Interface/Input.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ public enum Purpose {
// Init & dispose

public static void Init() {
GeneratePurposesCategories();
EventManager.OnKeyPressed += OnKeyPressed;
EventManager.OnKeyReleased += OnKeyReleased;
}
Expand All @@ -202,25 +203,23 @@ public static IEnumerable<Purpose> Purposes {

public static IEnumerable<Purpose> PurposesWithCategories {
get {
var purposesWithCategories = Enum.GetValues<Purpose>().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<Purpose>().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++;
}
}

Expand Down