Fixup Save/LoadLastRunWindowBounds: also save DpiWindowSizeFactor / r…

…estore size with DPI handling
pthom · Jul 5, 2024 · 60d0f73 · 60d0f73
1 parent 1a53360
commit 60d0f73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
@@ -703,7 +703,6 @@ void AbstractRunner::Setup()
             Impl_Select_Gl_Version();
     #endif
 
-    SetupDpiAwareParams();
     PrepareWindowGeometry();
 
     auto fnRenderCallbackDuringResize = [this]()
@@ -730,6 +729,9 @@ void AbstractRunner::Setup()
 
     Impl_SetWindowIcon();
 
+    SetupDpiAwareParams();
+
+
     // This should be done before Impl_LinkPlatformAndRenderBackends()
     // because, in the case of glfw ImGui_ImplGlfw_InstallCallbacks
     // will chain the user callbacks with ImGui callbacks;

diff --git a/src/hello_imgui/internal/hello_imgui_ini_settings.cpp b/src/hello_imgui/internal/hello_imgui_ini_settings.cpp
@@ -243,11 +243,16 @@ namespace HelloImGui
                 // DpiWindowSizeFactor was added late, so it may not be present in the ini file
                 if (appWindowSection.find("DpiWindowSizeFactor") != appWindowSection.end())
                 {
-                    float dpiWindowSizeFactor_WhenSaved = iniFile["AppWindow"]["DpiWindowSizeFactor"].as<float>();
-                    bool isDpiSane = (dpiWindowSizeFactor_WhenSaved >= 0.1) || (dpiWindowSizeFactor_WhenSaved <= 10.0);
+                    float dpiWindowSizeFactor_Now =
+                        HelloImGui::GetRunnerParams()->dpiAwareParams.dpiWindowSizeFactor;
+                    float dpiWindowSizeFactor_WhenSaved =
+                        iniFile["AppWindow"]["DpiWindowSizeFactor"].as<float>();
+                    bool isDpiSane = (dpiWindowSizeFactor_WhenSaved >= 0.1f) &&
+                                     (dpiWindowSizeFactor_WhenSaved <= 10.f) &&
+                                     (dpiWindowSizeFactor_Now > 0.1f) && 
+                                     (dpiWindowSizeFactor_Now < 10.f);
                     if (isDpiSane)
                     {
-                        float dpiWindowSizeFactor_Now = HelloImGui::GetRunnerParams()->dpiAwareParams.dpiWindowSizeFactor;
                         float ratio = dpiWindowSizeFactor_Now / dpiWindowSizeFactor_WhenSaved;
                         if (ratio != 1.f)
                         {