Merge branch 'master' into docking

# Conflicts: # imgui_internal.h
2025-12-22 06:15:37 +00:00 · 2025-03-13 21:01:21 +01:00
parent 2d403a1614 b758b8223f
commit aa97252f60
10 changed files with 45 additions and 8 deletions
--- a/backends/imgui_impl_sdl3.cpp
+++ b/backends/imgui_impl_sdl3.cpp
@@ -327,6 +327,7 @@ ImGuiKey ImGui_ImplSDL3_KeyEventToImGuiKey(SDL_Keycode keycode, SDL_Scancode sca
    case SDL_SCANCODE_COMMA: return ImGuiKey_Comma;
    case SDL_SCANCODE_PERIOD: return ImGuiKey_Period;
    case SDL_SCANCODE_SLASH: return ImGuiKey_Slash;
+    default: break;
    }
    return ImGuiKey_None;
 }