Merge branch 'master' into docking

# Conflicts: # backends/imgui_impl_sdl3.cpp
2025-12-23 14:49:06 +00:00 · 2024-07-01 17:10:12 +02:00
parent 3fec562da1 cb16be3a3f
commit 3369cbd277
14 changed files with 90 additions and 56 deletions
--- a/examples/example_sdl3_sdlrenderer3/main.cpp
+++ b/examples/example_sdl3_sdlrenderer3/main.cpp
@@ -31,9 +31,6 @@ int main(int, char**)
        return -1;
    }

-    // Enable native IME.
-    SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");
-
    // Create window with SDL_Renderer graphics context
    Uint32 window_flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN;
    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+SDL_Renderer example", 1280, 720, window_flags);