Update ImGui

CasualPokePlayer · Nov 30, 2024 · cb7bff0 · cb7bff0
1 parent f10f7a5
commit cb7bff0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/GSE/GSE.csproj b/GSE/GSE.csproj
@@ -23,7 +23,7 @@
 		<TargetName>libGSE</TargetName>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ImGui.NET" Version="1.90.1.1" ExcludeAssets="native" />
+		<PackageReference Include="ImGui.NET" Version="1.91.0.1" ExcludeAssets="native" />
 		<PackageReference Include="SharpCompress" Version="0.38.0" />
 		<PackageReference Include="System.IO.Hashing" Version="9.0.0" />
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" PrivateAssets="all" />

diff --git a/GSE/Gui/ImGuiWindow.cs b/GSE/Gui/ImGuiWindow.cs
@@ -229,7 +229,7 @@ private static unsafe void SetClipboardText(nint userdata, nint text)
 	}
 
 	[UnmanagedCallersOnly(CallConvs = [ typeof(CallConvCdecl) ])]
-	private static unsafe void SetPlatformImeData(ImGuiViewport* viewport, ImGuiPlatformImeData* data)
+	private static unsafe void PlatformSetImeData(ImGuiViewport* viewport, ImGuiPlatformImeData* data)
 	{
 		if (data->WantVisible != 0)
 		{
@@ -522,7 +522,7 @@ public ImGuiWindow(string windowName, Config config, bool isMainWindow)
 				io.ClipboardUserData = io.BackendPlatformUserData;
 				io.GetClipboardTextFn = (nint)(delegate* unmanaged[Cdecl]<nint, nint>)&GetClipboardText;
 				io.SetClipboardTextFn = (nint)(delegate* unmanaged[Cdecl]<nint, nint, void>)&SetClipboardText;
-				io.SetPlatformImeDataFn = (nint)(delegate* unmanaged[Cdecl]<ImGuiViewport*, ImGuiPlatformImeData*, void>)&SetPlatformImeData;
+				io.PlatformSetImeDataFn = (nint)(delegate* unmanaged[Cdecl]<ImGuiViewport*, ImGuiPlatformImeData*, void>)&PlatformSetImeData;
 			}
 
 			_dpiScale = GetDpiScale();

diff --git a/externals/cimgui/cimgui b/externals/cimgui/cimgui
+2 −1		README.md
+109 −0		backend_test/example_glfw_dx11/CMakeLists.txt
+6 −0		backend_test/example_glfw_dx11/README.md
+247 −0		backend_test/example_glfw_dx11/main.c
+27 −17		backend_test/example_glfw_opengl3/CMakeLists.txt
+4 −0		backend_test/example_glfw_opengl3/README.md
+357 −153		cimgui.cpp
+544 −245		cimgui.h
+1 −1		generator/cimgui_template.cpp
+4 −0		generator/cimgui_template.h
+2 −0		generator/cpp2ffi.lua
+6 −3		generator/generator.lua
+5 −1		generator/output/cimgui_impl.h
+3,112 −1,842		generator/output/definitions.json
+2,954 −1,883		generator/output/definitions.lua
+60 −28		generator/output/impl_definitions.json
+54 −28		generator/output/impl_definitions.lua
+16 −13		generator/output/overloads.txt
+1,392 −585		generator/output/structs_and_enums.json
+2,216 −1,596		generator/output/structs_and_enums.lua
+13 −4		generator/output/typedefs_dict.json
+13 −4		generator/output/typedefs_dict.lua
+4 −0		generator/print_defines.cpp
+1 −1		imgui