From 916d9cdfa9c67f0539d96b7f0d5c9ae4ae8d457f Mon Sep 17 00:00:00 2001
From: Patrick Dawson <pat@dw.is>
Date: Thu, 2 May 2024 00:38:19 +0200
Subject: [PATCH] Update to ImGui 1.90.5

---
 .github/workflows/gdext.yml               |  2 +-
 Dear ImGui for Godot Demo.csproj          | 10 +++++-----
 doc/examples/GDExt/SConstruct             |  2 +-
 doc/examples/Module/README.md             |  2 +-
 doc/examples/ToolCSharp/ToolCSharp.csproj |  2 +-
 gdext/imgui                               |  2 +-
 gdext/scripts/gds_bindings.py             |  1 +
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/gdext.yml b/.github/workflows/gdext.yml
index d3dd2e05..2571a10d 100644
--- a/.github/workflows/gdext.yml
+++ b/.github/workflows/gdext.yml
@@ -7,7 +7,7 @@ on:
 
 
 env:
-  vcpkg_tag: a34c873a9717a888f58dc05268dea15592c2f0ff # 2024.03.25
+  vcpkg_tag: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01 # 2024.04.26
 
 jobs:
   windows:
diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
index e9379d23..71713a60 100644
--- a/Dear ImGui for Godot Demo.csproj	
+++ b/Dear ImGui for Godot Demo.csproj	
@@ -11,20 +11,20 @@
     <EmbeddedResource Remove="doc\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ImGui.NET" Version="1.90.1.1" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.12.1">
+    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.1">
+    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.CodeFixes" Version="4.12.1">
+    <PackageReference Include="Roslynator.CodeFixes" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.1">
+    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/doc/examples/GDExt/SConstruct b/doc/examples/GDExt/SConstruct
index fec90503..5baf4130 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.1-docking"
+IMGUI_TAG = "v1.90.5-docking"
 
 import os
 import subprocess
diff --git a/doc/examples/Module/README.md b/doc/examples/Module/README.md
index beddb47c..ddef9b9e 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.1-docking
+git -C imgui checkout v1.90.5-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 9c94b738..09cbef21 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.1.1" />
+    <PackageReference Include="ImGui.NET" Version="1.90.5.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/gdext/imgui b/gdext/imgui
index 2dc85e6e..1db579d4 160000
--- a/gdext/imgui
+++ b/gdext/imgui
@@ -1 +1 @@
-Subproject commit 2dc85e6e438e6d7f485317c9b76dc153535fed16
+Subproject commit 1db579d458da29fa43376af9d88d486910d9406a
diff --git a/gdext/scripts/gds_bindings.py b/gdext/scripts/gds_bindings.py
index 19c07b1e..27b1d97f 100644
--- a/gdext/scripts/gds_bindings.py
+++ b/gdext/scripts/gds_bindings.py
@@ -89,6 +89,7 @@
     "ImGui_GetColorU32",
     "ImGui_GetColorU32Ex",
     "ImGui_GetColorU32ImU32",
+    "ImGui_GetColorU32ImU32Ex",
     "ImGui_GetColorU32ImVec4",
     "ImGui_GetCurrentContext",
     "ImGui_NewFrame",