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

fix: Don't close modals on focus change

This commit is contained in:
WerWolv 2025-08-18 20:49:27 +02:00
parent b3d07b4573
commit b5bf9f1486
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/gui/source/window/window.cpp
View File

@ -549,6 +549,8 @@ namespace hex {
}
}
}
} else {
popupClosed = true;
}
if (currPopup != nullptr) {

8
plugins/builtin/source/content/events.cpp
View File

@ -365,6 +365,9 @@ namespace hex::plugin::builtin {
static ImGuiWindow *lastFocusedWindow = nullptr;
if (focused) {
if (lastFocusedWindow == nullptr)
return;
// If the main window gains focus again, restore the last focused window
ImGui::FocusWindow(lastFocusedWindow);
ImGui::FocusWindow(lastFocusedWindow, ImGuiFocusRequestFlags_RestoreFocusedChild);
@ -373,10 +376,13 @@ namespace hex::plugin::builtin {
log::debug("Restoring focus on window '{}'", lastFocusedWindow->Name ? lastFocusedWindow->Name : "Unknown Window");
lastFocusedWindow = nullptr;
} else {
if (ctx->NavWindow != nullptr && (ctx->NavWindow->Flags & ImGuiWindowFlags_Modal))
return;
// If the main window loses focus, store the currently focused window
// and remove focus from it so it doesn't look like it's focused and
// cursor blink animations don't play
lastFocusedWindow = ctx->NavWindow;
lastFocusedWindow = ctx->NavWindow;
ImGui::FocusWindow(nullptr);
if (lastFocusedWindow != nullptr)