mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Check tracker fixes (#2414)

This commit is contained in:
aMannus 2023-01-28 01:16:31 +01:00 committed by GitHub
parent 0aab836d1f
commit 72dcf3466b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@ -25,7 +25,7 @@ void InitializeChecks();
void UpdateChecks(); void UpdateChecks();
void UpdateInventoryChecks(); void UpdateInventoryChecks();
void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckStatus); void DrawLocation(RandomizerCheckObject rcObj, RandomizerCheckShow* thisCheckStatus);
void BeginFloatWindows(std::string UniqueName, ImGuiWindowFlags flags = 0); void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags = 0);
void EndFloatWindows(); void EndFloatWindows();
void UpdateOrdering(bool init = false); void UpdateOrdering(bool init = false);
bool ShouldUpdateChecks(); bool ShouldUpdateChecks();
@ -113,6 +113,8 @@ void DrawCheckTracker(bool& open) {
return; return;
} }
ImGui::SetNextWindowSize(ImVec2(400, 540), ImGuiCond_FirstUseEver);
if (doInitialize) if (doInitialize)
InitializeChecks(); InitializeChecks();
else if (initialized && (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2)) { else if (initialized && (gPlayState == nullptr || gSaveContext.fileNum < 0 || gSaveContext.fileNum > 2)) {
@ -136,7 +138,7 @@ void DrawCheckTracker(bool& open) {
} }
} }
BeginFloatWindows("Check Tracker", ImGuiWindowFlags_NoScrollbar); BeginFloatWindows("Check Tracker", open, ImGuiWindowFlags_NoScrollbar);
if (!initialized) { if (!initialized) {
ImGui::Text("Waiting for file load..."); //TODO Language ImGui::Text("Waiting for file load..."); //TODO Language
@ -326,7 +328,7 @@ void DrawCheckTracker(bool& open) {
} }
// Windowing stuff // Windowing stuff
void BeginFloatWindows(std::string UniqueName, ImGuiWindowFlags flags) { void BeginFloatWindows(std::string UniqueName, bool& open, ImGuiWindowFlags flags) {
ImGuiWindowFlags windowFlags = flags; ImGuiWindowFlags windowFlags = flags;
if (windowFlags == 0) { if (windowFlags == 0) {
@ -347,7 +349,7 @@ void BeginFloatWindows(std::string UniqueName, ImGuiWindowFlags flags) {
Color_Background.b / 255.0f, Color_Background.a / 255.0f)); Color_Background.b / 255.0f, Color_Background.a / 255.0f));
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0)); ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 4.0f);
ImGui::Begin(UniqueName.c_str(), nullptr, windowFlags); ImGui::Begin(UniqueName.c_str(), &open, windowFlags);
} }
void EndFloatWindows() { void EndFloatWindows() {
ImGui::PopStyleVar(); ImGui::PopStyleVar();