Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-19 06:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Viewport: Fixed glitches with newly appearing menus creating viewport while the underlying imgui window should be hidden. (#1542)

Browse Source
This commit is contained in:
omar 2018-04-25 11:23:34 +02:00
parent 7684f53328
commit 6d6580f6be
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imgui.cpp
View File

@ -3578,6 +3578,8 @@ void ImGui::UpdatePlatformWindows()
// New windows that appears directly in a new viewport won't always have a size on their frame // New windows that appears directly in a new viewport won't always have a size on their frame
if (viewport->Size.x <= 0 || viewport->Size.y <= 0) if (viewport->Size.x <= 0 || viewport->Size.y <= 0)
continue; continue;
if (viewport->Window && viewport->Window->HiddenFrames > 0)
continue;
// Update viewport flags // Update viewport flags
if (viewport->Window != NULL) if (viewport->Window != NULL)
@ -3640,7 +3642,7 @@ void ImGui::UpdatePlatformWindows()
} }
// This is a default/basic function for performing the rendering/swap of multiple platform windows. // This is a default/basic function for performing the rendering/swap of multiple platform windows.
// Custom renderers may prefer to not call this function at all, and instead iterate the platform data and handle rendering/sync themselves. // Custom renderers may prefer to not call this function at all, and instead iterate the publicly exposed platform data and handle rendering/sync themselves.
// The Render/Swap functions stored in ImGuiPlatformIO are merely here to allow for this helper to exist, but you can do it yourself: // The Render/Swap functions stored in ImGuiPlatformIO are merely here to allow for this helper to exist, but you can do it yourself:
// //
// ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); // ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
@ -4539,6 +4541,8 @@ void ImGui::EndFrame()
ImGuiViewportP* viewport = g.Viewports[i]; ImGuiViewportP* viewport = g.Viewports[i];
if (viewport->LastFrameActive < g.FrameCount || viewport->Size.x <= 0.0f || viewport->Size.y <= 0.0f) if (viewport->LastFrameActive < g.FrameCount || viewport->Size.x <= 0.0f || viewport->Size.y <= 0.0f)
continue; continue;
if (viewport->Window && viewport->Window->HiddenFrames > 0)
continue;
if (i > 0) if (i > 0)
IM_ASSERT(viewport->Window != NULL); IM_ASSERT(viewport->Window != NULL);
g.PlatformIO.Viewports.push_back(viewport); g.PlatformIO.Viewports.push_back(viewport);