mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Nav: Fixed clipped scoring when exiting a NavFlattened child back to a parent item (clipping not desirable then). (followup and fix to c665c15
). (#787)
This commit is contained in:
parent
6d98c0323b
commit
512ffa37bd
@ -2341,9 +2341,9 @@ static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
|
|||||||
const ImRect& curr = g.NavScoringRectScreen; // Current modified source rect (NB: we've applied Max.x = Min.x in NavUpdate() to inhibit the effect of having varied item width)
|
const ImRect& curr = g.NavScoringRectScreen; // Current modified source rect (NB: we've applied Max.x = Min.x in NavUpdate() to inhibit the effect of having varied item width)
|
||||||
g.NavScoringCount++;
|
g.NavScoringCount++;
|
||||||
|
|
||||||
if (window != g.NavWindow)
|
// When entering through a NavFlattened border, we consider child window items as fully clipped for scoring
|
||||||
|
if (window->ParentWindow == g.NavWindow)
|
||||||
{
|
{
|
||||||
// When crossing through a NavFlattened border, we score items on the other windows fully clipped
|
|
||||||
IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened);
|
IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened);
|
||||||
if (!window->ClipRect.Contains(cand))
|
if (!window->ClipRect.Contains(cand))
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user