Late reporting of the fact that the GUI was asked to be closed.

This will allow us to still display a functioning GUI while the process is shutting down.
AliceO2Group · Aug 18, 2023 · 50fe5c3 · 50fe5c3
1 parent 897e168
commit 50fe5c3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/DebugGUI/CMakeLists.txt b/DebugGUI/CMakeLists.txt
@@ -40,6 +40,7 @@ if(APPLE)
     src/implot_internal.h
     src/imconfig.h
     src/DebugGUIAPIv2.h
+    src/DebugGUIAPIv3.h
 #    src/Sokol3DUtils.h
     src/DebugGUI.h
     src/imgui_impl_glfw.h
@@ -68,6 +69,7 @@ elseif(GLFW_FOUND)
     src/GL3DUtils.h
     src/DebugGUI.h
     src/DebugGUIAPIv2.h
+    src/DebugGUIAPIv3.h
     src/imgui_impl_opengl3.h
     src/imgui_impl_glfw.h
     src/icons_font_awesome.h
@@ -85,6 +87,7 @@ else()
     src/GL3DUtils.h
     src/DebugGUI.h
     src/DebugGUIAPIv2.h
+    src/DebugGUIAPIv3.h
     src/imgui_impl_glfw_gl3.h
     src/icons_font_awesome.h
   )

diff --git a/DebugGUI/src/DebugGUI.cxx b/DebugGUI/src/DebugGUI.cxx
@@ -101,9 +101,6 @@ bool pollGUIPreRender(void* context, float delta)
   if (context) {
     GLFWwindow* window = reinterpret_cast<GLFWwindow*>(context);
 
-    if (glfwWindowShouldClose(window)) {
-      return false;
-    }
     glfwPollEvents();
     ImGui_ImplOpenGL3_NewFrame();
     ImGui_ImplGlfw_NewFrame();
@@ -116,6 +113,10 @@ bool pollGUIPreRender(void* context, float delta)
     ImVec4 clear_color = ImColor(114, 144, 154);
     glClearColor(clear_color.x, clear_color.y, clear_color.z, clear_color.w);
     glClear(GL_COLOR_BUFFER_BIT);
+
+    if (glfwWindowShouldClose(window)) {
+      return false;
+    }
   } else {
     // Just initialize new frame
     ImGuiIO& io = ImGui::GetIO();

diff --git a/DebugGUI/src/DebugGUIAPIv3.h b/DebugGUI/src/DebugGUIAPIv3.h
diff --git a/DebugGUI/src/DebugGUIMacos.mm b/DebugGUI/src/DebugGUIMacos.mm
@@ -161,9 +161,6 @@ bool pollGUIPreRender(void *context, float delta) {
 
   auto *ctx = reinterpret_cast<DebugGUIContext *>(context);
   NSWindow *nswin = glfwGetCocoaWindow(ctx->window);
-  if (glfwWindowShouldClose(ctx->window)) {
-    return false;
-  }
   @autoreleasepool {
     glfwPollEvents();
     int width, height;
@@ -183,8 +180,7 @@ bool pollGUIPreRender(void *context, float delta) {
     ImGui_ImplGlfw_NewFrame();
     ImGui::NewFrame();
   }
-
-  return true;
+  return glfwWindowShouldClose(ctx->window) == false;
 }
 
 void pollGUIPostRender(void *context, void *drawData) {