Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_sdl3.cpp
This commit is contained in:
ocornut
2024-07-01 17:10:12 +02:00
14 changed files with 90 additions and 56 deletions

View File

@@ -57,9 +57,6 @@ int main(int, char**)
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
#endif
// Enable native IME.
SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");
// Create window with graphics context
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);