mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge branch 'master' into docking
# Conflicts: # backends/imgui_impl_dx12.cpp # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp
This commit is contained in:
commit
942b64abfc
27 changed files with 984 additions and 20 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.91.4
|
||||
// dear imgui, v1.91.5 WIP
|
||||
// (main code and documentation)
|
||||
|
||||
// Help:
|
||||
|
|
@ -22212,7 +22212,7 @@ void ImGui::DebugNodeWindow(ImGuiWindow* window, const char* label)
|
|||
for (int layer = 0; layer < ImGuiNavLayer_COUNT; layer++)
|
||||
{
|
||||
ImRect r = window->NavRectRel[layer];
|
||||
if (r.Min.x >= r.Max.y && r.Min.y >= r.Max.y)
|
||||
if (r.Min.x >= r.Max.x && r.Min.y >= r.Max.y)
|
||||
BulletText("NavLastIds[%d]: 0x%08X", layer, window->NavLastIds[layer]);
|
||||
else
|
||||
BulletText("NavLastIds[%d]: 0x%08X at +(%.1f,%.1f)(%.1f,%.1f)", layer, window->NavLastIds[layer], r.Min.x, r.Min.y, r.Max.x, r.Max.y);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue