Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-26 05:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP Menus: fixed hovering handling of menus from menu bars (#126)

Browse Source
This commit is contained in:
ocornut 2015-05-17 17:21:49 +01:00
parent f2b738648f
commit 88d7b3de23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -4707,7 +4707,7 @@ static inline bool IsWindowContentHoverable(ImGuiWindow* window)
static bool IsHovered(const ImRect& bb, ImGuiID id) static bool IsHovered(const ImRect& bb, ImGuiID id)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
if (g.HoveredId == 0) if (g.HoveredId == 0 || g.HoveredId == id)
{ {
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
if (g.HoveredRootWindow == window->RootWindow) if (g.HoveredRootWindow == window->RootWindow)
@ -7504,7 +7504,7 @@ bool ImGui::BeginMenu(const char* label)
RenderCollapseTriangle(pos + ImVec2(window->MenuColumns.Pos[2] + extra_w + g.FontSize * 0.20f, 0.0f), false); RenderCollapseTriangle(pos + ImVec2(window->MenuColumns.Pos[2] + extra_w + g.FontSize * 0.20f, 0.0f), false);
} }
bool hovered = ImGui::IsItemHovered(); bool hovered = IsHovered(window->DC.LastItemRect, id);
if (!opened && hovered) if (!opened && hovered)
{ {
ImGui::OpenPopup(label); ImGui::OpenPopup(label);