From 0148d913e152cc37a9eec688c8426be5730b4283 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Mon, 23 Mar 2026 13:46:46 +0100
Subject: [PATCH] Add a bunch of missing imgui close buttons

---
 src/dusk/imgui/ImGuiMapLoader.cpp      | 6 ++----
 src/dusk/imgui/ImGuiMenuGame.cpp       | 2 +-
 src/dusk/imgui/ImGuiMenuTools.cpp      | 4 ++--
 src/dusk/imgui/ImGuiProcessOverlay.cpp | 2 +-
 src/dusk/imgui/ImGuiSaveEditor.cpp     | 4 ++--
 src/dusk/imgui/ImGuiSaveEditor.hpp     | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/dusk/imgui/ImGuiMapLoader.cpp b/src/dusk/imgui/ImGuiMapLoader.cpp
index 4b52fd1b04..74e60e4974 100644
--- a/src/dusk/imgui/ImGuiMapLoader.cpp
+++ b/src/dusk/imgui/ImGuiMapLoader.cpp
@@ -12,19 +12,17 @@ namespace dusk {
             return;
         }
 
-        ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_AlwaysAutoResize |
+        ImGuiWindowFlags windowFlags = ImGuiWindowFlags_AlwaysAutoResize |
             ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoNav;
     
         ImGui::SetNextWindowBgAlpha(0.65f);
         ImGui::SetNextWindowSizeConstraints(ImVec2(300, 0), ImVec2(FLT_MAX, FLT_MAX));
     
-        if (!ImGui::Begin("Map Loader", nullptr, windowFlags)) {
+        if (!ImGui::Begin("Map Loader", &m_showMapLoader, windowFlags)) {
             ImGui::End();
             return;
         }
 
-        ImGui::SeparatorText("Map Loader");
-
         ImGui::Checkbox("Show Internal Names", &m_mapLoaderInfo.showInternalNames);
 
         const char* previewRegion = "None";
diff --git a/src/dusk/imgui/ImGuiMenuGame.cpp b/src/dusk/imgui/ImGuiMenuGame.cpp
index 2366fb6a42..a0b79579eb 100644
--- a/src/dusk/imgui/ImGuiMenuGame.cpp
+++ b/src/dusk/imgui/ImGuiMenuGame.cpp
@@ -110,7 +110,7 @@ namespace dusk {
         ImGui::SetNextWindowBgAlpha(0.65f);
         ImGui::SetNextWindowSizeConstraints(ImVec2(850, 400), ImVec2(850, 400));
 
-        if (!ImGui::Begin("Controller Config", nullptr, windowFlags)) {
+        if (!ImGui::Begin("Controller Config", &m_showControllerConfig, windowFlags)) {
             ImGui::End();
             return;
         }
diff --git a/src/dusk/imgui/ImGuiMenuTools.cpp b/src/dusk/imgui/ImGuiMenuTools.cpp
index d848690063..e84dbc1f08 100644
--- a/src/dusk/imgui/ImGuiMenuTools.cpp
+++ b/src/dusk/imgui/ImGuiMenuTools.cpp
@@ -61,7 +61,7 @@ namespace dusk {
         ShowPlayerInfo();
 
         if (m_showSaveEditor) {
-            m_saveEditor.draw();
+            m_saveEditor.draw(m_showSaveEditor);
         }
 
         DuskDebugPad(); // temporary, remove later
@@ -141,7 +141,7 @@ namespace dusk {
         ImGui::SetNextWindowBgAlpha(0.65f);
         ImGui::SetNextWindowSizeConstraints(ImVec2(300, 200), ImVec2(300, 200));
 
-        if (ImGui::Begin("Player Info", nullptr, windowFlags)) {
+        if (ImGui::Begin("Player Info", &m_showPlayerInfo, windowFlags)) {
             daAlink_c* player = (daAlink_c*)dComIfGp_getPlayer(0);
             daHorse_c* horse = dComIfGp_getHorseActor();
 
diff --git a/src/dusk/imgui/ImGuiProcessOverlay.cpp b/src/dusk/imgui/ImGuiProcessOverlay.cpp
index cf2d22402e..04a87f00b6 100644
--- a/src/dusk/imgui/ImGuiProcessOverlay.cpp
+++ b/src/dusk/imgui/ImGuiProcessOverlay.cpp
@@ -74,7 +74,7 @@ namespace dusk {
             return;
         }
 
-        if (ImGui::Begin("Processes")) {
+        if (ImGui::Begin("Processes", &m_showProcessManagement)) {
             if (ImGui::BeginTabBar("Tabs")) {
                 showTreeRecursive = true;
                 if (ImGui::BeginTabItem("Tree")) {
diff --git a/src/dusk/imgui/ImGuiSaveEditor.cpp b/src/dusk/imgui/ImGuiSaveEditor.cpp
index b21196fa54..00cadfaa4a 100644
--- a/src/dusk/imgui/ImGuiSaveEditor.cpp
+++ b/src/dusk/imgui/ImGuiSaveEditor.cpp
@@ -272,14 +272,14 @@ namespace dusk {
 
     ImGuiSaveEditor::ImGuiSaveEditor() {}
 
-    void ImGuiSaveEditor::draw() {
+    void ImGuiSaveEditor::draw(bool& open) {
         ImGuiIO& io = ImGui::GetIO();
         ImGuiWindowFlags windowFlags = ImGuiWindowFlags_NoResize;
 
         ImGui::SetNextWindowBgAlpha(0.65f);
         ImGui::SetNextWindowSizeConstraints(ImVec2(600, 700), ImVec2(600, 700));
 
-        if (ImGui::Begin("Save Editor", nullptr, windowFlags)) {
+        if (ImGui::Begin("Save Editor", &open, windowFlags)) {
             if (ImGui::BeginTabBar("SaveEditorTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
                 if (ImGui::BeginTabItem("Player Status")) {
                     drawPlayerStatusTab();
diff --git a/src/dusk/imgui/ImGuiSaveEditor.hpp b/src/dusk/imgui/ImGuiSaveEditor.hpp
index f6668a75db..3afc1b8145 100644
--- a/src/dusk/imgui/ImGuiSaveEditor.hpp
+++ b/src/dusk/imgui/ImGuiSaveEditor.hpp
@@ -11,7 +11,7 @@ namespace dusk {
 	public:
 		ImGuiSaveEditor();
 		
-		void draw();
+		void draw(bool& open);
         void drawPlayerStatusTab();
         void drawLocationTab();
 		void drawInventoryTab();