Merge branch 'master' into refactor_backends

# Conflicts: # src/hello_imgui/internal/backend_impls/abstract_runner.cpp
pthom · Dec 29, 2023 · 9e0bf35 · 9e0bf35
2 parents 72f4d7f + 07ee9cc
commit 9e0bf35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
@@ -395,7 +395,12 @@ void AbstractRunner::SetImGuiPrefs()
         ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
 #endif
     }
-    ImGui::GetIO().IniFilename = nullptr;
+
+    #ifndef IMGUI_BUNDLE_PYTHON_API
+        ImGui::GetIO().IniFilename = NULL;
+    #else
+        ImGui::GetIO().IniFilename = "";
+    #endif
 }
 
 void AbstractRunner::Setup()
@@ -734,7 +739,7 @@ bool AbstractRunner::ShallIdleThisFrame_Emscripten()
     ImGuiContext& g = *GImGui;
     bool hasInputEvent =  ! g.InputEventsQueue.empty();
 
-    if (! params.fpsIdling.enableIdling)
+    if (! params.fpsIdling.enableIdling || (params.fpsIdling.fpsIdle <= 0.f) )
     {
         params.fpsIdling.isIdling = false;
         return false;

diff --git a/src/hello_imgui/internal/menu_statusbar.cpp b/src/hello_imgui/internal/menu_statusbar.cpp
@@ -115,6 +115,5 @@ void ShowStatusBar(RunnerParams & params)
     ImGui::End();
 }
 
-
 }  // namespace Menu_StatusBar
 }  // namespace HelloImGui