Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed function (#323)

Browse Source
docking
ocornut 8 years ago
parent ead79dcdac
commit e3fec8c0aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
imgui.cpp
Unescape Escape View File

@ -2363,7 +2363,7 @@ static ImVec2 NavCalcPreferredMousePos()
return ImClamp(p, r.Min, r.Max); 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; ImGuiContext& g = *GImGui;
g.NavId = id; g.NavId = id;
@ -2519,7 +2519,7 @@ static void NavUpdate()
// Apply result from previous frame navigation directional move request // Apply result from previous frame navigation directional move request
ImGui::SetActiveID(0); ImGui::SetActiveID(0);
SetNavIdMoveMouse(g.NavMoveResultId, g.NavMoveResultRectRel); SetNavIdAndMoveMouse(g.NavMoveResultId, g.NavMoveResultRectRel);
g.NavMoveFromClampedRefRect = false; g.NavMoveFromClampedRefRect = false;
} }
@ -2590,7 +2590,7 @@ static void NavUpdate()
g.NavDisableHighlight = false; g.NavDisableHighlight = false;
g.NavDisableMouseHover = true; g.NavDisableMouseHover = true;
if (g.NavLayer == 0 && g.NavWindow->NavLastId) if (g.NavLayer == 0 && g.NavWindow->NavLastId)
SetNavIdMoveMouse(g.NavWindow->NavLastId, ImRect()); SetNavIdAndMoveMouse(g.NavWindow->NavLastId, ImRect());
else else
NavInitWindow(g.NavWindow, true); NavInitWindow(g.NavWindow, true);
} }
@ -2632,7 +2632,7 @@ static void NavUpdate()
// Leave the "menu" layer // Leave the "menu" layer
g.NavLayer = 0; g.NavLayer = 0;
if (g.NavWindow->NavLastId) if (g.NavWindow->NavLastId)
SetNavIdMoveMouse(g.NavWindow->NavLastId, ImRect()); SetNavIdAndMoveMouse(g.NavWindow->NavLastId, ImRect());
else else
NavInitWindow(g.NavWindow, true); NavInitWindow(g.NavWindow, true);
} }

Write Preview
Loading…
Cancel
Save