ImGui fixes for self-hotsed imgui.h

gwaldron · Jul 12, 2024 · 448e91b · 448e91b
1 parent e285c3b
commit 448e91b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/osgEarthImGui/Common b/src/osgEarthImGui/Common
@@ -13,8 +13,7 @@
 
 // note: No Windows declspec's here because we are using CMAKE_EXINDOWS_EXPORT_ALL_SYMBOLS
 
-#include <GL/glew.h>
-
 #ifndef IMGUI_VERSION
+#include <GL/glew.h>
 #include <osgEarthImGui/imgui.h>
 #endif
diff --git a/src/osgEarthImGui/ImGuiApp b/src/osgEarthImGui/ImGuiApp
@@ -242,22 +242,14 @@ namespace osgEarth
                 ImGui::EndMainMenuBar();
             }
 
-            bool dirty = false;
-
             for (auto& iter : _menu)
             {
                 for (auto& gui : iter.second)
                 {
                     if (gui->isVisible())
                         gui->draw(ri);
-
-                    if (gui->visibilityChanged())
-                        dirty = true;
                 }
             }
-
-            if (dirty)
-                ImGuiPanel::dirtySettings();
         }
 
         //! Toggle a GUI's visibility by its type

diff --git a/src/osgEarthImGui/ImGuiPanel b/src/osgEarthImGui/ImGuiPanel
@@ -26,6 +26,7 @@
 #include <osgEarth/MapNode>
 #include <osgEarth/Terrain>
 #include <osgEarth/GeoData>
+#include <osgEarth/NodeUtils>
 
 #include <osgDB/ReadFile>
 #include <osg/observer_ptr>
@@ -180,12 +181,9 @@ namespace osgEarth
             save(conf);
         }
 
-        //! tells ImGui it needs to write a new .ini file
-        static void dirtySettings()
+        void dirtySettings()
         {
-            std::string file = ImGui::GetIO().IniFilename;
-            if (file.empty()) file = "imgui.ini";
-            ImGui::SaveIniSettingsToDisk(file.c_str());
+            // nop - settings save automatically
         }
 
         //! whether the visibility changed (and resets the flag)