mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-24 20:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backends: SDL: Fixed building backend under non-OSX Apple targets (e.g. iPhone). (#5665)

Browse Source
This commit is contained in:
ocornut
2022-09-09 16:45:16 +02:00
parent aceab9a877
commit caf4b7f1e6
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backends/imgui_impl_sdl.cpp
View File

@@ -408,13 +408,14 @@ static bool ImGui_ImplSDL2_Init(SDL_Window* window, SDL_Renderer* renderer, void
// Our mouse update function expect PlatformHandle to be filled for the main viewport // Our mouse update function expect PlatformHandle to be filled for the main viewport
ImGuiViewport* main_viewport = ImGui::GetMainViewport(); ImGuiViewport* main_viewport = ImGui::GetMainViewport();
main_viewport->PlatformHandle = (void*)window; main_viewport->PlatformHandle = (void*)window;
main_viewport->PlatformHandleRaw = NULL;
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
if (SDL_GetWindowWMInfo(window, &info)) if (SDL_GetWindowWMInfo(window, &info))
{ {
#ifdef _WIN32 #ifdef _WIN32
main_viewport->PlatformHandleRaw = (void*)info.info.win.window; main_viewport->PlatformHandleRaw = (void*)info.info.win.window;
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
main_viewport->PlatformHandleRaw = (void*)info.info.cocoa.window; main_viewport->PlatformHandleRaw = (void*)info.info.cocoa.window;
#endif #endif
} }
@@ -754,13 +755,14 @@ static void ImGui_ImplSDL2_CreateWindow(ImGuiViewport* viewport)
SDL_GL_MakeCurrent(vd->Window, backup_context); SDL_GL_MakeCurrent(vd->Window, backup_context);
viewport->PlatformHandle = (void*)vd->Window; viewport->PlatformHandle = (void*)vd->Window;
viewport->PlatformHandleRaw = NULL;
SDL_SysWMinfo info; SDL_SysWMinfo info;
SDL_VERSION(&info.version); SDL_VERSION(&info.version);
if (SDL_GetWindowWMInfo(vd->Window, &info)) if (SDL_GetWindowWMInfo(vd->Window, &info))
{ {
#if defined(_WIN32) #if defined(_WIN32)
viewport->PlatformHandleRaw = info.info.win.window; viewport->PlatformHandleRaw = info.info.win.window;
#elif defined(__APPLE__) #elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
viewport->PlatformHandleRaw = (void*)info.info.cocoa.window; viewport->PlatformHandleRaw = (void*)info.info.cocoa.window;
#endif #endif
} }

1
docs/CHANGELOG.txt
View File

@@ -192,6 +192,7 @@ Docking+Viewports Branch:
- Docking: Fixed amending into an existing tab bar from rendering invisible items. (#5515) - Docking: Fixed amending into an existing tab bar from rendering invisible items. (#5515)
- Docking+Viewports: Fixed undocking window node causing parent viewports to become unresponsive - Docking+Viewports: Fixed undocking window node causing parent viewports to become unresponsive
in certain situation (e.g. hidden tab bar). (#5503) [@rokups] in certain situation (e.g. hidden tab bar). (#5503) [@rokups]
- Backends: SDL: Fixed building backend under non-OSX Apple targets (e.g. iPhone). (#5665)
- Backends: GLFW: Fixed leftover static variable preventing from changing or - Backends: GLFW: Fixed leftover static variable preventing from changing or
reinitializing backend while application is running. (#4616, #5434) [@rtoumazet] reinitializing backend while application is running. (#4616, #5434) [@rtoumazet]