Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

impr: Make sure detached windows always have an appropriate size

This commit is contained in:
WerWolv 2024-01-03 18:26:25 +01:00
parent 62093a8dd8
commit ed8934882e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builtin/include/content/views/view_tools.hpp
View File

@ -17,6 +17,8 @@ namespace hex::plugin::builtin {
private: private:
std::vector<ContentRegistry::Tools::impl::Entry>::iterator m_dragStartIterator; std::vector<ContentRegistry::Tools::impl::Entry>::iterator m_dragStartIterator;
std::map<ImGuiWindow*, float> m_windowHeights;
}; };
} }

13
plugins/builtin/source/content/views/view_tools.cpp
View File

@ -56,9 +56,15 @@ namespace hex::plugin::builtin {
// If the tool is still attached to the main window, don't draw it here // If the tool is still attached to the main window, don't draw it here
if (!detached) continue; if (!detached) continue;
// Load the window height that is dependent on the tool content
const auto windowName = View::toWindowName(name);
const auto height = m_windowHeights[ImGui::FindWindowByName(windowName.c_str())];
if (height > 0)
ImGui::SetNextWindowSizeConstraints(ImVec2(400_scaled, height), ImVec2(FLT_MAX, height));
// Create a new window for the tool // Create a new window for the tool
if (ImGui::Begin(View::toWindowName(name).c_str(), &detached, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize)) { if (ImGui::Begin(windowName.c_str(), &detached, ImGuiWindowFlags_NoCollapse)) {
// Draw the tool // Draw the tool content
function(); function();
// Handle the first frame after the tool has been detached // Handle the first frame after the tool has been detached
@ -69,6 +75,9 @@ namespace hex::plugin::builtin {
GImGui->MovingWindow = ImGui::GetCurrentWindowRead(); GImGui->MovingWindow = ImGui::GetCurrentWindowRead();
GImGui->ActiveId = GImGui->MovingWindow->MoveId; GImGui->ActiveId = GImGui->MovingWindow->MoveId;
} }
const auto window = ImGui::GetCurrentWindowRead();
m_windowHeights[ImGui::GetCurrentWindowRead()] = ImGui::CalcWindowNextAutoFitSize(window).y;
} }
ImGui::End(); ImGui::End();
} }