mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Nav: shallow tidying up.

Browse source
This commit is contained in:
ocornut 2024-10-14 17:30:14 +02:00
parent 626d358e55
commit ad37b79bca
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
imgui.cpp
View file

@ -4443,9 +4443,9 @@ bool ImGui::IsItemHovered(ImGuiHoveredFlags flags)
if (g.NavDisableMouseHover && !g.NavDisableHighlight && !(flags & ImGuiHoveredFlags_NoNavOverride))
{
if ((g.LastItemData.InFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled))
if (g.LastItemData.ID == g.NavId && g.NavId != 0) // IsItemFocused()
return false;
if (!IsItemFocused())
if ((g.LastItemData.InFlags & ImGuiItemFlags_Disabled) && !(flags & ImGuiHoveredFlags_AllowWhenDisabled))
return false;
if (flags & ImGuiHoveredFlags_ForTooltip)
@ -5784,9 +5784,7 @@ bool ImGui::IsItemDeactivatedAfterEdit()
bool ImGui::IsItemFocused()
{
ImGuiContext& g = *GImGui;
if (g.NavId != g.LastItemData.ID || g.NavId == 0)
return false;
return true;
return g.NavId == g.LastItemData.ID && g.NavId != 0;
}
// Important: this can be useful but it is NOT equivalent to the behavior of e.g.Button()!