|
@@ -170,8 +170,8 @@ static ImGui_ImplSDL2_Data* ImGui_ImplSDL2_GetBackendData()
|
|
|
|
|
|
// Forward Declarations
|
|
|
static void ImGui_ImplSDL2_UpdateMonitors();
|
|
|
-static void ImGui_ImplSDL2_InitPlatformInterface(SDL_Window* window, void* sdl_gl_context);
|
|
|
-static void ImGui_ImplSDL2_ShutdownPlatformInterface();
|
|
|
+static void ImGui_ImplSDL2_InitMultiViewportSupport(SDL_Window* window, void* sdl_gl_context);
|
|
|
+static void ImGui_ImplSDL2_ShutdownMultiViewportSupport();
|
|
|
|
|
|
// Functions
|
|
|
static const char* ImGui_ImplSDL2_GetClipboardText(ImGuiContext*)
|
|
@@ -587,9 +587,9 @@ static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer, void
|
|
|
#endif
|
|
|
|
|
|
// We need SDL_CaptureMouse(), SDL_GetGlobalMouseState() from SDL 2.0.4+ to support multiple viewports.
|
|
|
- // We left the call to ImGui_ImplSDL2_InitPlatformInterface() outside of #ifdef to avoid unused-function warnings.
|
|
|
- if ((io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) && (io.BackendFlags & ImGuiBackendFlags_PlatformHasViewports))
|
|
|
- ImGui_ImplSDL2_InitPlatformInterface(window, sdl_gl_context);
|
|
|
+ // We left the call to ImGui_ImplSDL2_InitMultiViewportSupport() outside of #ifdef to avoid unused-function warnings.
|
|
|
+ if (io.BackendFlags & ImGuiBackendFlags_PlatformHasViewports)
|
|
|
+ ImGui_ImplSDL2_InitMultiViewportSupport(window, sdl_gl_context);
|
|
|
|
|
|
return true;
|
|
|
}
|
|
@@ -642,7 +642,7 @@ void ImGui_ImplSDL2_Shutdown()
|
|
|
IM_ASSERT(bd != nullptr && "No platform backend to shutdown, or already shutdown?");
|
|
|
ImGuiIO& io = ImGui::GetIO();
|
|
|
|
|
|
- ImGui_ImplSDL2_ShutdownPlatformInterface();
|
|
|
+ ImGui_ImplSDL2_ShutdownMultiViewportSupport();
|
|
|
|
|
|
if (bd->ClipboardTextData)
|
|
|
SDL_free(bd->ClipboardTextData);
|
|
@@ -1154,7 +1154,7 @@ static int ImGui_ImplSDL2_CreateVkSurface(ImGuiViewport* viewport, ImU64 vk_inst
|
|
|
}
|
|
|
#endif // SDL_HAS_VULKAN
|
|
|
|
|
|
-static void ImGui_ImplSDL2_InitPlatformInterface(SDL_Window* window, void* sdl_gl_context)
|
|
|
+static void ImGui_ImplSDL2_InitMultiViewportSupport(SDL_Window* window, void* sdl_gl_context)
|
|
|
{
|
|
|
// Register platform interface (will be coupled with a renderer interface)
|
|
|
ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
|
|
@@ -1190,7 +1190,7 @@ static void ImGui_ImplSDL2_InitPlatformInterface(SDL_Window* window, void* sdl_g
|
|
|
main_viewport->PlatformHandle = (void*)(intptr_t)vd->WindowID;
|
|
|
}
|
|
|
|
|
|
-static void ImGui_ImplSDL2_ShutdownPlatformInterface()
|
|
|
+static void ImGui_ImplSDL2_ShutdownMultiViewportSupport()
|
|
|
{
|
|
|
ImGui::DestroyPlatformWindows();
|
|
|
}
|