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

InputText: ensure mouse cursor is set regardless of whether keyboard mode is enabled or not. (#6417)

Browse source 
+ Nav comments (#8059)
This commit is contained in:
ocornut 2024-10-14 13:52:40 +02:00
parent 20ae8bd4c3
commit 349af8766c
4 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
imgui.cpp
View file

@ -4606,7 +4606,7 @@ bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id, ImGuiItemFlags item_flag
}
#endif
if (g.NavDisableMouseHover)
if (g.NavDisableMouseHover && (item_flags & ImGuiItemFlags_NoNavDisableMouseHover) == 0)
return false;
return true;
@ -13340,8 +13340,11 @@ static void ImGui::NavUpdateCancelRequest()
else
{
// Clear NavLastId for popups but keep it for regular child window so we can leave one and come back where we were
// FIXME-NAV: This should happen on window appearing.
if (g.NavWindow && ((g.NavWindow->Flags & ImGuiWindowFlags_Popup) || !(g.NavWindow->Flags & ImGuiWindowFlags_ChildWindow)))
g.NavWindow->NavLastIds[0] = 0;
// Clear nav focus
g.NavId = 0;
}
}