Nav: Hovering MenuItem/Selectable with mouse makes NavId, matching what seems to be Windows beahvior at least for menus (#323)

ago%!(EXTRA string=9 years) · 43ee5d73e9
parent 30c04d0dbe
commit 43ee5d73e9
1 changed files with 7 additions and 0 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -9484,6 +9484,13 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
    if (flags & ImGuiSelectableFlags_Disabled)
        selected = false;

+    // Hovering selectable with mouse updates NavId accordingly so navigation can be resumed with gamepad/keyboard (this doesn't happen on most widgets)
+    if (hovered && !g.NavDisableMouseHover && (g.IO.MouseDelta.x != 0.0f || g.IO.MouseDelta.y != 0.0f))
+    {
+        g.NavDisableHighlight = true;
+        SetNavId(id);
+    }
+
    // Render
    if (hovered || selected)
    {