From 4987dd7fd004ec608c649d2a1cab2648d815703d Mon Sep 17 00:00:00 2001 From: Malkierian Date: Wed, 21 May 2025 12:04:26 -0700 Subject: [PATCH] Apply RandoGenerating lockout to rando preset Apply button. --- soh/soh/Enhancements/Presets/Presets.cpp | 4 +++- soh/soh/Enhancements/randomizer/randomizer.cpp | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/Presets/Presets.cpp b/soh/soh/Enhancements/Presets/Presets.cpp index c2fafce01..9b2867223 100644 --- a/soh/soh/Enhancements/Presets/Presets.cpp +++ b/soh/soh/Enhancements/Presets/Presets.cpp @@ -146,7 +146,9 @@ void DrawPresetSelector(std::vector includeSections, std::string // UIWidgets::Tooltip(comboboxTooltip.c_str()); UIWidgets::PushStyleButton(THEME_COLOR); - if (ImGui::Button(("Apply Preset##" + selectorCvar).c_str())) { + if (UIWidgets::Button( + ("Apply Preset##" + selectorCvar).c_str(), + UIWidgets::ButtonOptions({ { .disabled = disabled } }).Color(THEME_COLOR).Size(UIWidgets::Sizes::Inline))) { applyPreset(currentIndex, includeSections); } UIWidgets::PopStyleButton(); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 4292284d8..f7279ff80 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3653,10 +3653,10 @@ void RandomizerSettingsWindow::DrawElement() { generated = 0; randoThread.join(); } - bool disableEditingRandoSettings = - CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) || CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0); + bool generating = CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0); + bool disableEditingRandoSettings = generating || CVarGetInteger(CVAR_GENERAL("OnFileSelectNameEntry"), 0); - DrawPresetSelector({ PRESET_SECTION_RANDOMIZER }, "Randomizer", disableEditingRandoSettings); + DrawPresetSelector({ PRESET_SECTION_RANDOMIZER }, "Randomizer", generating); // UIWidgets::Spacer(0); UIWidgets::CVarCheckbox("Manual seed entry", CVAR_RANDOMIZER_SETTING("ManualSeedEntry"),