Skip to content

Commit 159dd28

Browse files
authored
Merge pull request #417 from ImGuiNET/f/upgrade
Upgrade ImGui.NET to 1.89.6
2 parents f69f654 + 2245c4a commit 159dd28

File tree

12 files changed

+1132
-1013
lines changed

12 files changed

+1132
-1013
lines changed

deps/cimgui/linux-x64/cimgui.so

416 Bytes
Binary file not shown.

deps/cimgui/osx/cimgui.dylib

384 Bytes
Binary file not shown.

deps/cimgui/win-arm64/cimgui.dll

-3 KB
Binary file not shown.

deps/cimgui/win-x64/cimgui.dll

1.5 KB
Binary file not shown.

deps/cimgui/win-x86/cimgui.dll

2.5 KB
Binary file not shown.

src/CodeGenerator/definitions/cimgui/definitions.json

+961-878
Large diffs are not rendered by default.

src/CodeGenerator/definitions/cimgui/structs_and_enums.json

+164-128
Large diffs are not rendered by default.

src/ImGui.NET/Generated/ImGuiIO.gen.cs

+2
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public unsafe partial struct ImGuiIO
4646
public float ConfigMemoryCompactTimer;
4747
public byte ConfigDebugBeginReturnValueOnce;
4848
public byte ConfigDebugBeginReturnValueLoop;
49+
public byte ConfigDebugIgnoreFocusLoss;
4950
public byte* BackendPlatformName;
5051
public byte* BackendRendererName;
5152
public void* BackendPlatformUserData;
@@ -816,6 +817,7 @@ public unsafe partial struct ImGuiIOPtr
816817
public ref float ConfigMemoryCompactTimer => ref Unsafe.AsRef<float>(&NativePtr->ConfigMemoryCompactTimer);
817818
public ref bool ConfigDebugBeginReturnValueOnce => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueOnce);
818819
public ref bool ConfigDebugBeginReturnValueLoop => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueLoop);
820+
public ref bool ConfigDebugIgnoreFocusLoss => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIgnoreFocusLoss);
819821
public NullTerminatedString BackendPlatformName => new NullTerminatedString(NativePtr->BackendPlatformName);
820822
public NullTerminatedString BackendRendererName => new NullTerminatedString(NativePtr->BackendRendererName);
821823
public IntPtr BackendPlatformUserData { get => (IntPtr)NativePtr->BackendPlatformUserData; set => NativePtr->BackendPlatformUserData = (void*)value; }

src/ImGui.NET/Generated/ImGuiListClipper.gen.cs

-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ public void End()
4747
{
4848
ImGuiNative.ImGuiListClipper_End((ImGuiListClipper*)(NativePtr));
4949
}
50-
public void ForceDisplayRangeByIndices(int item_min, int item_max)
51-
{
52-
ImGuiNative.ImGuiListClipper_ForceDisplayRangeByIndices((ImGuiListClipper*)(NativePtr), item_min, item_max);
53-
}
5450
public bool Step()
5551
{
5652
byte ret = ImGuiNative.ImGuiListClipper_Step((ImGuiListClipper*)(NativePtr));

src/ImGui.NET/Generated/ImGuiNative.gen.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1123,10 +1123,10 @@ public static unsafe partial class ImGuiNative
11231123
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
11241124
public static extern void ImGuiListClipper_End(ImGuiListClipper* self);
11251125
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
1126-
public static extern void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self, int item_min, int item_max);
1127-
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
11281126
public static extern ImGuiListClipper* ImGuiListClipper_ImGuiListClipper();
11291127
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
1128+
public static extern void ImGuiListClipper_IncludeRangeByIndices(ImGuiListClipper* self, int item_begin, int item_end);
1129+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
11301130
public static extern byte ImGuiListClipper_Step(ImGuiListClipper* self);
11311131
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
11321132
public static extern void ImGuiOnceUponAFrame_destroy(ImGuiOnceUponAFrame* self);

src/ImGui.NET/Generated/ImGuiPlatformMonitor.gen.cs

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public unsafe partial struct ImGuiPlatformMonitor
1212
public Vector2 WorkPos;
1313
public Vector2 WorkSize;
1414
public float DpiScale;
15+
public void* PlatformHandle;
1516
}
1617
public unsafe partial struct ImGuiPlatformMonitorPtr
1718
{
@@ -26,6 +27,7 @@ public unsafe partial struct ImGuiPlatformMonitorPtr
2627
public ref Vector2 WorkPos => ref Unsafe.AsRef<Vector2>(&NativePtr->WorkPos);
2728
public ref Vector2 WorkSize => ref Unsafe.AsRef<Vector2>(&NativePtr->WorkSize);
2829
public ref float DpiScale => ref Unsafe.AsRef<float>(&NativePtr->DpiScale);
30+
public IntPtr PlatformHandle { get => (IntPtr)NativePtr->PlatformHandle; set => NativePtr->PlatformHandle = (void*)value; }
2931
public void Destroy()
3032
{
3133
ImGuiNative.ImGuiPlatformMonitor_destroy((ImGuiPlatformMonitor*)(NativePtr));

src/ImGui.NET/ImGui.NET.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<Description>A .NET wrapper for the Dear ImGui library.</Description>
4-
<AssemblyVersion>1.89.5.2</AssemblyVersion>
4+
<AssemblyVersion>1.89.6.0</AssemblyVersion>
55
<Authors>Eric Mellino</Authors>
66
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)