From e3fec8c0aaa00e92c0c22570ff7a7df6b3910074 Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 20 Aug 2016 19:19:58 +0200 Subject: [PATCH] Renamed function (#323) --- imgui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index d50b13b7..a26dd9be 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -2363,7 +2363,7 @@ static ImVec2 NavCalcPreferredMousePos() return ImClamp(p, r.Min, r.Max); } -static void SetNavIdMoveMouse(ImGuiID id, const ImRect& rect_rel) +static void SetNavIdAndMoveMouse(ImGuiID id, const ImRect& rect_rel) { ImGuiContext& g = *GImGui; g.NavId = id; @@ -2519,7 +2519,7 @@ static void NavUpdate() // Apply result from previous frame navigation directional move request ImGui::SetActiveID(0); - SetNavIdMoveMouse(g.NavMoveResultId, g.NavMoveResultRectRel); + SetNavIdAndMoveMouse(g.NavMoveResultId, g.NavMoveResultRectRel); g.NavMoveFromClampedRefRect = false; } @@ -2590,7 +2590,7 @@ static void NavUpdate() g.NavDisableHighlight = false; g.NavDisableMouseHover = true; if (g.NavLayer == 0 && g.NavWindow->NavLastId) - SetNavIdMoveMouse(g.NavWindow->NavLastId, ImRect()); + SetNavIdAndMoveMouse(g.NavWindow->NavLastId, ImRect()); else NavInitWindow(g.NavWindow, true); } @@ -2632,7 +2632,7 @@ static void NavUpdate() // Leave the "menu" layer g.NavLayer = 0; if (g.NavWindow->NavLastId) - SetNavIdMoveMouse(g.NavWindow->NavLastId, ImRect()); + SetNavIdAndMoveMouse(g.NavWindow->NavLastId, ImRect()); else NavInitWindow(g.NavWindow, true); }