Skip to content

Commit 99d25ed

Browse files
committed
Upgrade to 1.89.9 imgui
1 parent 0ea06bb commit 99d25ed

File tree

14 files changed

+2003
-1647
lines changed

14 files changed

+2003
-1647
lines changed

deps/cimgui/linux-x64/cimgui.so

9.13 KB
Binary file not shown.

deps/cimgui/osx/cimgui.dylib

33.2 KB
Binary file not shown.

deps/cimgui/win-arm64/cimgui.dll

3 KB
Binary file not shown.

deps/cimgui/win-x64/cimgui.dll

5 KB
Binary file not shown.

deps/cimgui/win-x86/cimgui.dll

6 KB
Binary file not shown.

src/CodeGenerator/definitions/cimgui/definitions.json

Lines changed: 1548 additions & 1426 deletions
Large diffs are not rendered by default.

src/CodeGenerator/definitions/cimgui/structs_and_enums.json

Lines changed: 424 additions & 208 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public unsafe partial struct ImDrawData
1111
public int CmdListsCount;
1212
public int TotalIdxCount;
1313
public int TotalVtxCount;
14-
public ImDrawList** CmdLists;
14+
public ImVector CmdLists;
1515
public Vector2 DisplayPos;
1616
public Vector2 DisplaySize;
1717
public Vector2 FramebufferScale;
@@ -29,11 +29,16 @@ public unsafe partial struct ImDrawDataPtr
2929
public ref int CmdListsCount => ref Unsafe.AsRef<int>(&NativePtr->CmdListsCount);
3030
public ref int TotalIdxCount => ref Unsafe.AsRef<int>(&NativePtr->TotalIdxCount);
3131
public ref int TotalVtxCount => ref Unsafe.AsRef<int>(&NativePtr->TotalVtxCount);
32-
public IntPtr CmdLists { get => (IntPtr)NativePtr->CmdLists; set => NativePtr->CmdLists = (ImDrawList**)value; }
32+
public ImVector<ImDrawListPtr> CmdLists => new ImVector<ImDrawListPtr>(NativePtr->CmdLists);
3333
public ref Vector2 DisplayPos => ref Unsafe.AsRef<Vector2>(&NativePtr->DisplayPos);
3434
public ref Vector2 DisplaySize => ref Unsafe.AsRef<Vector2>(&NativePtr->DisplaySize);
3535
public ref Vector2 FramebufferScale => ref Unsafe.AsRef<Vector2>(&NativePtr->FramebufferScale);
3636
public ImGuiViewportPtr OwnerViewport => new ImGuiViewportPtr(NativePtr->OwnerViewport);
37+
public void AddDrawList(ImDrawListPtr draw_list)
38+
{
39+
ImDrawList* native_draw_list = draw_list.NativePtr;
40+
ImGuiNative.ImDrawData_AddDrawList((ImDrawData*)(NativePtr), native_draw_list);
41+
}
3742
public void Clear()
3843
{
3944
ImGuiNative.ImDrawData_Clear((ImDrawData*)(NativePtr));

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ public enum ImGuiHoveredFlags
1818
AllowWhenOverlapped = 768,
1919
RectOnly = 928,
2020
RootAndChildWindows = 3,
21-
ForTooltip = 2048,
22-
Stationary = 4096,
23-
DelayNone = 8192,
24-
DelayShort = 16384,
25-
DelayNormal = 32768,
26-
NoSharedDelay = 65536,
21+
ForTooltip = 4096,
22+
Stationary = 8192,
23+
DelayNone = 16384,
24+
DelayShort = 32768,
25+
DelayNormal = 65536,
26+
NoSharedDelay = 131072,
2727
}
2828
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public unsafe partial struct ImGuiIO
5656
public void* ClipboardUserData;
5757
public IntPtr SetPlatformImeDataFn;
5858
public void* _UnusedPadding;
59+
public ushort PlatformLocaleDecimalPoint;
5960
public byte WantCaptureMouse;
6061
public byte WantCaptureKeyboard;
6162
public byte WantTextInput;
@@ -826,6 +827,7 @@ public unsafe partial struct ImGuiIOPtr
826827
public IntPtr ClipboardUserData { get => (IntPtr)NativePtr->ClipboardUserData; set => NativePtr->ClipboardUserData = (void*)value; }
827828
public ref IntPtr SetPlatformImeDataFn => ref Unsafe.AsRef<IntPtr>(&NativePtr->SetPlatformImeDataFn);
828829
public IntPtr _UnusedPadding { get => (IntPtr)NativePtr->_UnusedPadding; set => NativePtr->_UnusedPadding = (void*)value; }
830+
public ref ushort PlatformLocaleDecimalPoint => ref Unsafe.AsRef<ushort>(&NativePtr->PlatformLocaleDecimalPoint);
829831
public ref bool WantCaptureMouse => ref Unsafe.AsRef<bool>(&NativePtr->WantCaptureMouse);
830832
public ref bool WantCaptureKeyboard => ref Unsafe.AsRef<bool>(&NativePtr->WantCaptureKeyboard);
831833
public ref bool WantTextInput => ref Unsafe.AsRef<bool>(&NativePtr->WantTextInput);
@@ -953,9 +955,9 @@ public void AddMouseWheelEvent(float wheel_x, float wheel_y)
953955
{
954956
ImGuiNative.ImGuiIO_AddMouseWheelEvent((ImGuiIO*)(NativePtr), wheel_x, wheel_y);
955957
}
956-
public void ClearInputCharacters()
958+
public void ClearEventsQueue()
957959
{
958-
ImGuiNative.ImGuiIO_ClearInputCharacters((ImGuiIO*)(NativePtr));
960+
ImGuiNative.ImGuiIO_ClearEventsQueue((ImGuiIO*)(NativePtr));
959961
}
960962
public void ClearInputKeys()
961963
{

0 commit comments

Comments
 (0)