Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)

7 years ago · 2f15cc0855
parent 05885b2e6d
commit 2f15cc0855
1 changed files with 1 additions and 1 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -4790,7 +4790,7 @@ static void NavProcessMoveRequestWrapAround(ImGuiWindow* window)
        {
            g.NavMoveRequestForwardStep = 1;
            NavMoveRequestCancel();
-            g.NavWindow->NavRectRel[0].Min.y = g.NavWindow->NavRectRel[0].Max.y = (g.NavMoveDir == ImGuiDir_Up) ? window->SizeFull.y : 0.0f;
+            g.NavWindow->NavRectRel[0].Min.y = g.NavWindow->NavRectRel[0].Max.y = ((g.NavMoveDir == ImGuiDir_Up) ? ImMax(window->SizeFull.y, window->SizeContents.y) : 0.0f) - window->Scroll.y;
        }
 }