From 4f6d9b0d81f9ed8ba1a623b1fc331195f2473a0b Mon Sep 17 00:00:00 2001
From: Patrick Dawson <pat@dw.is>
Date: Thu, 16 May 2024 15:04:15 +0100
Subject: [PATCH] Update to ImGui 1.90.6

---
 .github/workflows/godot.yml               | 2 +-
 .gitignore                                | 2 +-
 Dear ImGui for Godot Demo.csproj          | 2 +-
 doc/examples/GDExt/CMakeLists.txt         | 2 +-
 doc/examples/GDExt/SConstruct             | 2 +-
 doc/examples/Module/README.md             | 2 +-
 doc/examples/ToolCSharp/ToolCSharp.csproj | 4 ++--
 gdext/SConstruct                          | 4 +++-
 gdext/dear_bindings                       | 2 +-
 gdext/imgui                               | 2 +-
 gdext/include/.gdignore                   | 0
 11 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 gdext/include/.gdignore

diff --git a/.github/workflows/godot.yml b/.github/workflows/godot.yml
index c49fc26a..4fe7de23 100644
--- a/.github/workflows/godot.yml
+++ b/.github/workflows/godot.yml
@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        gdver: ["4.2.2", "4.3.0-dev.5"]
+        gdver: ["4.2.2", "4.3.0-dev.6"]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
index 4a4b1d28..be680267 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ addons/imgui-godot-native/
 gdext/proj/addons/imgui-godot/
 gdext/samples/project/addons/
 addons/imgui-godot/imgui-godot-native.gdextension
-addons/imgui-godot/include/*.h
+addons/imgui-godot/include/
 scons_cache
 doc/**/addons/
 addons/imgui-godot/include/imgui-version.txt
diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
index 71713a60..77ebd77d 100644
--- a/Dear ImGui for Godot Demo.csproj	
+++ b/Dear ImGui for Godot Demo.csproj	
@@ -11,7 +11,7 @@
     <EmbeddedResource Remove="doc\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
+    <PackageReference Include="ImGui.NET" Version="1.90.6.1" />
     <PackageReference Include="Roslynator.Analyzers" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/doc/examples/GDExt/CMakeLists.txt b/doc/examples/GDExt/CMakeLists.txt
index 1f768b53..163a45c8 100644
--- a/doc/examples/GDExt/CMakeLists.txt
+++ b/doc/examples/GDExt/CMakeLists.txt
@@ -17,7 +17,7 @@ FetchContent_MakeAvailable(godot-cpp)
 FetchContent_Declare(
     imgui
     GIT_REPOSITORY https://github.com/ocornut/imgui
-    GIT_TAG v1.90.5-docking
+    GIT_TAG v1.90.6-docking
 )
 FetchContent_MakeAvailable(imgui)
 
diff --git a/doc/examples/GDExt/SConstruct b/doc/examples/GDExt/SConstruct
index 5baf4130..6aa62bf0 100644
--- a/doc/examples/GDExt/SConstruct
+++ b/doc/examples/GDExt/SConstruct
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 IMGUI_GODOT_INCLUDE = "../../../addons/imgui-godot/include"
-IMGUI_TAG = "v1.90.5-docking"
+IMGUI_TAG = "v1.90.6-docking"
 
 import os
 import subprocess
diff --git a/doc/examples/Module/README.md b/doc/examples/Module/README.md
index ddef9b9e..58ad150e 100644
--- a/doc/examples/Module/README.md
+++ b/doc/examples/Module/README.md
@@ -2,7 +2,7 @@ Run, for example:
 
 ```
 git clone https://github.com/ocornut/imgui
-git -C imgui checkout v1.90.5-docking
+git -C imgui checkout v1.90.6-docking
 git clone https://github.com/godotengine/godot
 cd godot
 scons custom_modules=../modules
diff --git a/doc/examples/ToolCSharp/ToolCSharp.csproj b/doc/examples/ToolCSharp/ToolCSharp.csproj
index 09cbef21..eda45660 100644
--- a/doc/examples/ToolCSharp/ToolCSharp.csproj
+++ b/doc/examples/ToolCSharp/ToolCSharp.csproj
@@ -5,6 +5,6 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
+    <PackageReference Include="ImGui.NET" Version="1.90.6.1" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/gdext/SConstruct b/gdext/SConstruct
index eb524a10..46d71f3f 100644
--- a/gdext/SConstruct
+++ b/gdext/SConstruct
@@ -49,9 +49,11 @@ else:
 if not os.path.exists("gen/imgui_bindings.gen.h"):
     subprocess.call("python scripts/gds_bindings.py", shell=True)
 
+shutil.copy("imgui-godot-native.gdextension", "../addons/imgui-godot/")
+shutil.copytree("include", "../addons/imgui-godot/include", dirs_exist_ok=True)
+
 sources = Glob("src/*.cpp") + Glob("imgui/*.cpp") + Glob("gen/*.cpp")
 
-shutil.copy("imgui-godot-native.gdextension", "../addons/imgui-godot/")
 (extension_path,) = glob("../addons/imgui-godot/*.gdextension")
 addon_path = Path(extension_path).parent
 project_name = Path(extension_path).stem
diff --git a/gdext/dear_bindings b/gdext/dear_bindings
index f7f1fb2f..ea72e041 160000
--- a/gdext/dear_bindings
+++ b/gdext/dear_bindings
@@ -1 +1 @@
-Subproject commit f7f1fb2f3ca053f51f67f1e6ff5b859d8bea89de
+Subproject commit ea72e0418a00de52e2dbf82f58d2ac0c22cddd96
diff --git a/gdext/imgui b/gdext/imgui
index 1db579d4..e391fe2e 160000
--- a/gdext/imgui
+++ b/gdext/imgui
@@ -1 +1 @@
-Subproject commit 1db579d458da29fa43376af9d88d486910d9406a
+Subproject commit e391fe2e66eb1c96b1624ae8444dc64c23146ef4
diff --git a/gdext/include/.gdignore b/gdext/include/.gdignore
new file mode 100644
index 00000000..e69de29b