diff --git a/soh/soh/Enhancements/debugger/ImGuiHelpers.cpp b/soh/soh/Enhancements/debugger/ImGuiHelpers.cpp index c5af1dc29..629da69b6 100644 --- a/soh/soh/Enhancements/debugger/ImGuiHelpers.cpp +++ b/soh/soh/Enhancements/debugger/ImGuiHelpers.cpp @@ -20,12 +20,12 @@ void InsertHelpHoverText(const std::string& text) { } } -void PaddedSeparator(bool topPadding, bool bottomPadding, float x, float y) { - if (topPadding) { - ImGui::Dummy(ImVec2(x, y)); +void PaddedSeparator(bool padTop, bool padBottom, float extraVerticalPadding) { + if (padTop) { + ImGui::Dummy(ImVec2(0.0f, extraVerticalPadding)); } ImGui::Separator(); - if (bottomPadding) { - ImGui::Dummy(ImVec2(x, y)); + if (padBottom) { + ImGui::Dummy(ImVec2(0.0f, extraVerticalPadding)); } } diff --git a/soh/soh/Enhancements/debugger/ImGuiHelpers.h b/soh/soh/Enhancements/debugger/ImGuiHelpers.h index b9b6c68f8..91df059aa 100644 --- a/soh/soh/Enhancements/debugger/ImGuiHelpers.h +++ b/soh/soh/Enhancements/debugger/ImGuiHelpers.h @@ -7,4 +7,4 @@ void SetLastItemHoverText(const std::string& text); void InsertHelpHoverText(const std::string& text); -void PaddedSeparator(bool topPadding = true, bool bottomPadding = true, float x = 0, float y = 0); +void PaddedSeparator(bool padTop = true, bool padBottom = true, float extraVerticalPadding = 0); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 6e88fff48..2ea241535 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -4249,18 +4249,18 @@ void DrawRandoEditor(bool& open) { ImGui::EndTabItem(); } - if (ImGui::BeginTabItem("Location Logic")) { + if (ImGui::BeginTabItem("Locations")) { ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, cellPadding); - if (ImGui::BeginTable("tableRandoLocationLogic", 2, + if (ImGui::BeginTable("tableRandoLocations", 2, ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) { - ImGui::TableSetupColumn("Exclude Item Checks", ImGuiTableColumnFlags_WidthStretch, 200.0f); ImGui::TableSetupColumn("Exclude Locations", ImGuiTableColumnFlags_WidthStretch, 200.0f); + ImGui::TableSetupColumn(" ", ImGuiTableColumnFlags_WidthStretch, 200.0f); ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true); ImGui::TableHeadersRow(); ImGui::PopItemFlag(); ImGui::TableNextRow(); - // COLUMN 1 - EXCLUDE ITEM CHECKS + // COLUMN 1 - EXCLUDE LOCATIONS ImGui::TableNextColumn(); window->DC.CurrLineTextBaseOffset = 0.0f; SohImGui::EnhancementCheckbox("Deku Theater Mask of Truth", "gRandomizeExcludeDekuTheaterMaskOfTruth"); @@ -4278,7 +4278,7 @@ void DrawRandoEditor(bool& open) { // COLUMN 2 - EXCLUDE LOCATIONS ImGui::TableNextColumn(); window->DC.CurrLineTextBaseOffset = 0.0f; - ImGui::Text("Coming soon"); + ImGui::EndTable(); }