From f5cbcce1123338451b4e1e6c6535ea7406d2a758 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 7 Dec 2023 11:53:16 +0100 Subject: [PATCH] impr: Add close button to toolbar --- main/gui/source/window/window.cpp | 6 ++++++ plugins/builtin/include/content/providers/null_provider.hpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/main/gui/source/window/window.cpp b/main/gui/source/window/window.cpp index 066141b68..a14dc0414 100644 --- a/main/gui/source/window/window.cpp +++ b/main/gui/source/window/window.cpp @@ -569,6 +569,12 @@ namespace hex { ImGui::SameLine(); } + if (auto provider = ImHexApi::Provider::get(); provider != nullptr) { + if (ImGui::CloseButton(ImGui::GetID("ProviderCloseButton"), ImGui::GetCursorScreenPos() + ImVec2(ImGui::GetContentRegionAvail().x - 17_scaled, 3_scaled))) { + ImHexApi::Provider::remove(provider); + } + } + ImGui::EndMenuBar(); } diff --git a/plugins/builtin/include/content/providers/null_provider.hpp b/plugins/builtin/include/content/providers/null_provider.hpp index ff3a3e328..00c7769b5 100644 --- a/plugins/builtin/include/content/providers/null_provider.hpp +++ b/plugins/builtin/include/content/providers/null_provider.hpp @@ -11,7 +11,7 @@ namespace hex::plugin::builtin { EventManager::subscribe([this](auto *newProvider) { if (newProvider == this) return; - + ImHexApi::Provider::remove(this, true); }); }