imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-27 23:37:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Menu bar focus issues

Browse Source
This commit is contained in:
WerWolv
2026-03-03 13:45:54 +01:00
parent 04a8bd6798
commit 380b1dbce3
4 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libimhex/include/hex/ui/view.hpp
View File

@@ -145,7 +145,6 @@ namespace hex {
* @brief A view that draws a regular window. This should be the default for most views
*/
class View::Window : public View {
ImGuiWindow *m_focusedSubWindow;
public:
explicit Window(UnlocalizedString unlocalizedName, const char *icon) : View(std::move(unlocalizedName), icon), m_focusedSubWindow(nullptr) {}
@@ -159,6 +158,12 @@ namespace hex {
virtual bool allowScroll() const {
return false;
}
private:
void handleFocusRestoration();
private:
ImGuiWindow *m_focusedSubWindow;
};
/**

73
lib/libimhex/source/ui/view.cpp
View File

@@ -10,6 +10,7 @@
#include <imgui.h>
#include <string>
#include <GLFW/glfw3.h>
namespace hex {
@@ -117,44 +118,43 @@ namespace hex {
return s_lastFocusedView;
}
void View::Window::handleFocusRestoration() {
const auto title = fmt::format("{} {}", this->getIcon(), View::toWindowName(this->getUnlocalizedName()));
void View::Window::draw(ImGuiWindowFlags extraFlags) {
if (this->shouldDraw()) {
const auto title = fmt::format("{} {}", this->getIcon(), View::toWindowName(this->getUnlocalizedName()));
const ImGuiContext& g = *ImGui::GetCurrentContext();
bool foundTopFocused = false;
ImGuiWindow *imguiFocusedWindow = nullptr;
ImGuiWindow *focusedSubWindow = nullptr;
const ImGuiContext& g = *ImGui::GetCurrentContext();
bool foundTopFocused = false;
ImGuiWindow *imguiFocusedWindow = nullptr;
ImGuiWindow *focusedSubWindow = nullptr;
if (g.NavWindow != nullptr) {
imguiFocusedWindow = g.NavWindow;
if (g.NavWindow != nullptr) {
imguiFocusedWindow = g.NavWindow;
foundTopFocused = true;
}
for (auto focusedWindow: g.WindowsFocusOrder | std::views::reverse) {
if (focusedWindow == nullptr || !focusedWindow->WasActive)
continue;
std::string focusedWindowName = focusedWindow->Name;
if (!foundTopFocused) {
imguiFocusedWindow = focusedWindow;
foundTopFocused = true;
}
for (auto focusedWindow: g.WindowsFocusOrder | std::views::reverse) {
if (focusedWindow == nullptr || !focusedWindow->WasActive)
continue;
std::string focusedWindowName = focusedWindow->Name;
if (!foundTopFocused) {
imguiFocusedWindow = focusedWindow;
foundTopFocused = true;
}
if (imguiFocusedWindow == nullptr || !focusedWindowName.contains("###hex.builtin.view."))
continue;
if (auto focusedChild = focusedWindow->NavLastChildNavWindow; focusedChild != nullptr)
focusedSubWindow = focusedChild;
else if (focusedWindow == focusedWindow->RootWindow)
focusedSubWindow = focusedWindow;
if (imguiFocusedWindow == nullptr || !focusedWindowName.contains("###hex.builtin.view."))
continue;
if (auto focusedChild = focusedWindow->NavLastChildNavWindow; focusedChild != nullptr)
focusedSubWindow = focusedChild;
else if (focusedWindow == focusedWindow->RootWindow)
focusedSubWindow = focusedWindow;
break;
}
break;
}
std::string imguiFocusedWindowName = "NULL";
if (imguiFocusedWindow != nullptr)
imguiFocusedWindowName.assign(imguiFocusedWindow->Name);
std::string imguiFocusedWindowName = "NULL";
if (imguiFocusedWindow != nullptr)
imguiFocusedWindowName.assign(imguiFocusedWindow->Name);
std::string focusedSubWindowName;
if (focusedSubWindow != nullptr || m_focusedSubWindow != nullptr) {
std::string focusedSubWindowName;
if (focusedSubWindow != nullptr || m_focusedSubWindow != nullptr) {
if (glfwGetWindowAttrib(ImHexApi::System::getMainWindowHandle(), GLFW_FOCUSED)) {
focusedSubWindowName = focusedSubWindow != nullptr ? focusedSubWindow->Name : m_focusedSubWindow->Name;
if (focusedSubWindow != nullptr && m_focusedSubWindow != nullptr) {
std::string_view windowName = m_focusedSubWindow->Name;
@@ -182,6 +182,15 @@ namespace hex {
}
}
}
}
}
void View::Window::draw(ImGuiWindowFlags extraFlags) {
if (this->shouldDraw()) {
const auto title = fmt::format("{} {}", this->getIcon(), View::toWindowName(this->getUnlocalizedName()));
handleFocusRestoration();
if (!allowScroll())
extraFlags |= ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
@@ -239,4 +248,4 @@ namespace hex {
}
}
}