organicmaps/imgui
13
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-04-05 05:25:08 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge e0d466b500 into 9fdeb41e52

Browse source
This commit is contained in:
The Loki 2025-04-02 08:31:07 +02:00 • committed by GitHub
commit b4abe05ae4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
backends/imgui_impl_glfw.cpp
View file

@ -218,6 +218,7 @@ static ImGui_ImplGlfw_Data* ImGui_ImplGlfw_GetBackendData()
// Forward Declarations
static void ImGui_ImplGlfw_UpdateMonitors();
static void ImGui_ImplGlfw_UpdateViewports();
static void ImGui_ImplGlfw_InitMultiViewportSupport();
static void ImGui_ImplGlfw_ShutdownMultiViewportSupport();
@ -984,6 +985,7 @@ void ImGui_ImplGlfw_NewFrame()
bd->Time = current_time;
bd->MouseIgnoreButtonUp = false;
ImGui_ImplGlfw_UpdateViewports();
ImGui_ImplGlfw_UpdateMouseData();
ImGui_ImplGlfw_UpdateMouseCursor();
@ -1065,6 +1067,7 @@ struct ImGui_ImplGlfw_ViewportData
{
GLFWwindow* Window; // Stored in ImGuiViewport::PlatformHandle
bool WindowOwned;
bool PlatformRequestResizeNextFrame;
int IgnoreWindowPosEventFrame;
int IgnoreWindowSizeEventFrame;
#ifdef _WIN32
@ -1075,6 +1078,25 @@ struct ImGui_ImplGlfw_ViewportData
~ImGui_ImplGlfw_ViewportData() { IM_ASSERT(Window == nullptr); }
};
static void ImGui_ImplGlfw_UpdateViewports()
{
ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
for (int n = 0; n < platform_io.Viewports.Size; n++)
{
ImGuiViewport* viewport = platform_io.Viewports[n];
if (ImGui_ImplGlfw_ViewportData* vd = (ImGui_ImplGlfw_ViewportData*)viewport->PlatformUserData){
if(vd->PlatformRequestResizeNextFrame){
// The previous frame's windowSizeCallback was invoked when glfwSetWindowPos was used, not triggered by glfwPollEvent.
// At this point, some critical operations that depend on PlatformRequestResize have already been completed.
// The PlatformRequestResize flag is cleared at the end of the frame,
// so we delay the operation to the current frame to ensure that the PlatformRequestResize behavior is fully completed.
viewport->PlatformRequestResize = true;
vd->PlatformRequestResizeNextFrame = false;
}
}
}
}
static void ImGui_ImplGlfw_WindowCloseCallback(GLFWwindow* window)
{
if (ImGuiViewport* viewport = ImGui::FindViewportByPlatformHandle(window))
@ -1112,6 +1134,15 @@ static void ImGui_ImplGlfw_WindowSizeCallback(GLFWwindow* window, int, int)
//data->IgnoreWindowSizeEventFrame = -1;
if (ignore_event)
return;
bool delay_to_next_frame = (ImGui::GetFrameCount() <= vd->IgnoreWindowPosEventFrame + 1);
if(delay_to_next_frame){
// glfwSetWindowPos and glfwSetWindowSizeCallback are called in the same frame
// we should not process the resize event in this frame
vd->PlatformRequestResizeNextFrame = true;
return;
}
}
viewport->PlatformRequestResize = true;
}