From 5320a6ebd3cd21a0aae246b6474810b662355cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Perkovi=C4=87?= Date: Sat, 18 Mar 2023 23:20:50 +0100 Subject: [PATCH] Backends: Made SDL3 backend compatible with commit 698dbd8. (#6255, #6146) --- backends/imgui_impl_sdl3.cpp | 3 ++- docs/CHANGELOG.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backends/imgui_impl_sdl3.cpp b/backends/imgui_impl_sdl3.cpp index 6b9fc0ba..a97abef4 100644 --- a/backends/imgui_impl_sdl3.cpp +++ b/backends/imgui_impl_sdl3.cpp @@ -733,7 +733,8 @@ static void ImGui_ImplSDL3_CreateWindow(ImGuiViewport* viewport) sdl_flags |= (viewport->Flags & ImGuiViewportFlags_NoTaskBarIcon) ? SDL_WINDOW_SKIP_TASKBAR : 0; #endif sdl_flags |= (viewport->Flags & ImGuiViewportFlags_TopMost) ? SDL_WINDOW_ALWAYS_ON_TOP : 0; - vd->Window = SDL_CreateWindow("No Title Yet", (int)viewport->Pos.x, (int)viewport->Pos.y, (int)viewport->Size.x, (int)viewport->Size.y, sdl_flags); + vd->Window = SDL_CreateWindow("No Title Yet", (int)viewport->Size.x, (int)viewport->Size.y, sdl_flags); + SDL_SetWindowPosition(vd->Window, (int)viewport->Pos.x, (int)viewport->Pos.y); vd->WindowOwned = true; if (use_opengl) { diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 9c7bed5a..5e891afc 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -114,7 +114,8 @@ Other changes: Docking+Viewports Branch: - Backends: GLFW: Fixed key modifiers handling on secondary viewports. (#6248, #6034) [@aiekick] -- Backends: GLFW: Fix Emscripten erroneously enabling multi-viewport support, leading to assert. (#5683) +- Backends: GLFW: Fixed Emscripten erroneously enabling multi-viewport support, leading to assert. (#5683) +- Backends: SDL3: Fixed for compilation with multi-viewports. (#6255) [@P3RK4N] -----------------------------------------------------------------------