From 591435761b4a2b2d14ebc2ea99decdf26c21a85b Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 22 Jul 2023 22:59:05 +0200 Subject: [PATCH] impr: Added "Close ImHex" button to all plugin-related fatal popups --- main/source/window/window.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/main/source/window/window.cpp b/main/source/window/window.cpp index d2461df51..63371b511 100644 --- a/main/source/window/window.cpp +++ b/main/source/window/window.cpp @@ -475,7 +475,7 @@ namespace hex { { auto drawPluginFolderTable = []() { ImGui::UnderlinedText("Plugin folders"); - if (ImGui::BeginTable("plugins", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY | ImGuiTableFlags_SizingFixedFit)) { + if (ImGui::BeginTable("plugins", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_ScrollY | ImGuiTableFlags_SizingFixedFit, ImVec2(0, 100_scaled))) { ImGui::TableSetupScrollFreeze(0, 1); ImGui::TableSetupColumn("Path", ImGuiTableColumnFlags_WidthStretch, 0.2); ImGui::TableSetupColumn("Exists", ImGuiTableColumnFlags_WidthFixed, ImGui::GetTextLineHeight() * 3); @@ -505,6 +505,10 @@ namespace hex { drawPluginFolderTable(); + ImGui::NewLine(); + if (ImGui::Button("Close ImHex", ImVec2(ImGui::GetContentRegionAvail().x, 0))) + ImHexApi::System::closeImHex(true); + ImGui::EndPopup(); } @@ -519,6 +523,10 @@ namespace hex { drawPluginFolderTable(); + ImGui::NewLine(); + if (ImGui::Button("Close ImHex", ImVec2(ImGui::GetContentRegionAvail().x, 0))) + ImHexApi::System::closeImHex(true); + ImGui::EndPopup(); } @@ -534,6 +542,10 @@ namespace hex { drawPluginFolderTable(); + ImGui::NewLine(); + if (ImGui::Button("Close ImHex", ImVec2(ImGui::GetContentRegionAvail().x, 0))) + ImHexApi::System::closeImHex(true); + ImGui::EndPopup(); } }