Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 04:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)

Browse Source
This commit is contained in:
omar
2018-03-07 12:35:26 +01:00
parent 52c78820aa
commit 9dcc07422e
17 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/imgui_impl_sdl2.cpp
View File

@ -149,8 +149,11 @@ bool ImGui_ImplSDL2_Init(SDL_Window* window, void* sdl_gl_context)
// Our mouse update function expect PlatformHandle to be filled for the main viewport
ImGuiViewport* main_viewport = ImGui::GetMainViewport();
main_viewport->PlatformHandle = (void*)window;
if (io.ConfigFlags & ImGuiConfigFlags_MultiViewports)
#if SDL_VERSION_ATLEAST(2,0,4)
io.ConfigFlags |= ImGuiConfigFlags_PlatformHasViewports;
if (io.ConfigFlags & ImGuiConfigFlags_EnableViewports)
ImGui_ImplSDL2_InitPlatformInterface(window, sdl_gl_context);
#endif
return true;
}
@ -172,7 +175,6 @@ static void ImGui_ImplSDL2_UpdateMouse()
io.MousePos = ImVec2(-FLT_MAX, -FLT_MAX);
io.MousePosViewport = 0;
io.MouseHoveredViewport = 0;
io.ConfigFlags &= ~ImGuiConfigFlags_PlatformHasMouseHoveredViewport; // FIXME-VIEWPORT: We can't get this info properly with SDL, capture is messing up with SDL_WINDOW_MOUSE_FOCUS report and we'd need to handle _NoInputs
int mx, my;
Uint32 mouse_buttons = SDL_GetMouseState(&mx, &my);