github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 13:23:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check Tracker - Works around issue where single characters don't show in EnhancementCombobox, and fixes a label for combo buttons held option

Browse source
This commit is contained in:
sonoftunk 2022-11-23 07:51:48 -05:00
commit f8984d6b5c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View file

@ -688,8 +688,8 @@ void ImGuiDrawTwoColorPickerSection(const char* text, const char* cvarMainName,
const char* windowType[] = { "Floating", "Window" }; const char* windowType[] = { "Floating", "Window" };
const char* displayType[] = { "Always", "Combo Button Hold" }; const char* displayType[] = { "Always", "Combo Button Hold" };
const char* buttonStrings[] = { "A", "B", "C-Up", "C-Down", "C-Left", "C-Right", "L", const char* buttonStrings[] = { "A Button", "B Button", "C-Up", "C-Down", "C-Left", "C-Right", "L Button",
"Z", "R", "Start", "D-Up", "D-Down", "D-Left", "D-Right" }; "Z Button", "R Button", "Start", "D-Up", "D-Down", "D-Left", "D-Right" };
void DrawCheckTrackerOptions(bool& open) { void DrawCheckTrackerOptions(bool& open) {
if (!open) { if (!open) {
CVar_SetS32("gCheckTrackerSettingsEnabled", 0); CVar_SetS32("gCheckTrackerSettingsEnabled", 0);
@ -733,10 +733,10 @@ void DrawCheckTrackerOptions(bool& open) {
ImGui::SameLine(); ImGui::SameLine();
UIWidgets::EnhancementCombobox("gCheckTrackerDisplayType", displayType, 2, 0); UIWidgets::EnhancementCombobox("gCheckTrackerDisplayType", displayType, 2, 0);
if (CVar_GetS32("gCheckTrackerDisplayType", 0) > 0) { if (CVar_GetS32("gCheckTrackerDisplayType", 0) > 0) {
ImGui::Text("Combo Button 2"); ImGui::Text("Combo Button 1");
ImGui::SameLine(); ImGui::SameLine();
UIWidgets::EnhancementCombobox("gCheckTrackerComboButton1", buttonStrings, 14, 6); UIWidgets::EnhancementCombobox("gCheckTrackerComboButton1", buttonStrings, 14, 6);
ImGui::Text("Combo Button 1"); ImGui::Text("Combo Button 2");
ImGui::SameLine(); ImGui::SameLine();
UIWidgets::EnhancementCombobox("gCheckTrackerComboButton2", buttonStrings, 14, 8); UIWidgets::EnhancementCombobox("gCheckTrackerComboButton2", buttonStrings, 14, 8);
} }