Merge remote-tracking branch 'origin' into 2016-07-navigation

2025-07-05 12:38:46 +02:00 · 2016-11-27 18:25:20 +01:00
parent 941cf1b436 219e4fb8fb
commit 3028ccc25b
24 changed files with 347 additions and 307 deletions
--- a/examples/directx9_example/imgui_impl_dx9.cpp
+++ b/examples/directx9_example/imgui_impl_dx9.cpp
@ -347,7 +347,8 @@ void ImGui_ImplDX9_NewFrame()
    }

    // Hide OS mouse cursor if ImGui is drawing it
-    SetCursor(io.MouseDrawCursor ? NULL : LoadCursor(NULL, IDC_ARROW));
+    if (io.MouseDrawCursor)
+        SetCursor(NULL);

    // Start the frame
    ImGui::NewFrame();