Skip to content

Commit 0ea06bb

Browse files
zaafarzaafar
authored
Merge pull request #419 from ImGuiNET/f/upgrade
Upgrade to 1.89.7
2 parents 159dd28 + 6e3a80a commit 0ea06bb

15 files changed

+47752
-47502
lines changed

‎deps/cimgui/linux-x64/cimgui.so

4.48 KB
Binary file not shown.

‎deps/cimgui/osx/cimgui.dylib

640 Bytes
Binary file not shown.

‎deps/cimgui/win-arm64/cimgui.dll

2 KB
Binary file not shown.

‎deps/cimgui/win-x64/cimgui.dll

0 Bytes
Binary file not shown.

‎deps/cimgui/win-x86/cimgui.dll

512 Bytes
Binary file not shown.

‎src/CodeGenerator/definitions/cimgui/definitions.json

+36,980-36,889
Large diffs are not rendered by default.

‎src/CodeGenerator/definitions/cimgui/structs_and_enums.json

+10,690-10,583
Large diffs are not rendered by default.

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

+39-4
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,11 @@ public static void BeginGroup()
515515
{
516516
ImGuiNative.igBeginGroup();
517517
}
518+
public static bool BeginItemTooltip()
519+
{
520+
byte ret = ImGuiNative.igBeginItemTooltip();
521+
return ret != 0;
522+
}
518523
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
519524
public static bool BeginListBox(ReadOnlySpan<char> label)
520525
#else
@@ -11855,14 +11860,40 @@ public static bool SetDragDropPayload(string type, IntPtr data, uint sz, ImGuiCo
1185511860
}
1185611861
return ret != 0;
1185711862
}
11858-
public static void SetItemAllowOverlap()
11859-
{
11860-
ImGuiNative.igSetItemAllowOverlap();
11861-
}
1186211863
public static void SetItemDefaultFocus()
1186311864
{
1186411865
ImGuiNative.igSetItemDefaultFocus();
1186511866
}
11867+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
11868+
public static void SetItemTooltip(ReadOnlySpan<char> fmt)
11869+
#else
11870+
public static void SetItemTooltip(string fmt)
11871+
#endif
11872+
{
11873+
byte* native_fmt;
11874+
int fmt_byteCount = 0;
11875+
if (fmt != null)
11876+
{
11877+
fmt_byteCount = Encoding.UTF8.GetByteCount(fmt);
11878+
if (fmt_byteCount > Util.StackAllocationSizeLimit)
11879+
{
11880+
native_fmt = Util.Allocate(fmt_byteCount + 1);
11881+
}
11882+
else
11883+
{
11884+
byte* native_fmt_stackBytes = stackalloc byte[fmt_byteCount + 1];
11885+
native_fmt = native_fmt_stackBytes;
11886+
}
11887+
int native_fmt_offset = Util.GetUtf8(fmt, native_fmt, fmt_byteCount);
11888+
native_fmt[native_fmt_offset] = 0;
11889+
}
11890+
else { native_fmt = null; }
11891+
ImGuiNative.igSetItemTooltip(native_fmt);
11892+
if (fmt_byteCount > Util.StackAllocationSizeLimit)
11893+
{
11894+
Util.Free(native_fmt);
11895+
}
11896+
}
1186611897
public static void SetKeyboardFocusHere()
1186711898
{
1186811899
int offset = 0;
@@ -11886,6 +11917,10 @@ public static void SetNextFrameWantCaptureMouse(bool want_capture_mouse)
1188611917
byte native_want_capture_mouse = want_capture_mouse ? (byte)1 : (byte)0;
1188711918
ImGuiNative.igSetNextFrameWantCaptureMouse(native_want_capture_mouse);
1188811919
}
11920+
public static void SetNextItemAllowOverlap()
11921+
{
11922+
ImGuiNative.igSetNextItemAllowOverlap();
11923+
}
1188911924
public static void SetNextItemOpen(bool is_open)
1189011925
{
1189111926
byte native_is_open = is_open ? (byte)1 : (byte)0;

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

+12-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,18 @@ public enum ImGuiHoveredFlags
1111
DockHierarchy = 16,
1212
AllowWhenBlockedByPopup = 32,
1313
AllowWhenBlockedByActiveItem = 128,
14-
AllowWhenOverlapped = 256,
15-
AllowWhenDisabled = 512,
16-
NoNavOverride = 1024,
17-
RectOnly = 416,
14+
AllowWhenOverlappedByItem = 256,
15+
AllowWhenOverlappedByWindow = 512,
16+
AllowWhenDisabled = 1024,
17+
NoNavOverride = 2048,
18+
AllowWhenOverlapped = 768,
19+
RectOnly = 928,
1820
RootAndChildWindows = 3,
19-
DelayNormal = 2048,
20-
DelayShort = 4096,
21-
NoSharedDelay = 8192,
21+
ForTooltip = 2048,
22+
Stationary = 4096,
23+
DelayNone = 8192,
24+
DelayShort = 16384,
25+
DelayNormal = 32768,
26+
NoSharedDelay = 65536,
2227
}
2328
}

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

+12-14
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ public unsafe partial struct ImGuiIO
1414
public float IniSavingRate;
1515
public byte* IniFilename;
1616
public byte* LogFilename;
17-
public float MouseDoubleClickTime;
18-
public float MouseDoubleClickMaxDist;
19-
public float MouseDragThreshold;
20-
public float KeyRepeatDelay;
21-
public float KeyRepeatRate;
22-
public float HoverDelayNormal;
23-
public float HoverDelayShort;
2417
public void* UserData;
2518
public ImFontAtlas* Fonts;
2619
public float FontGlobalScale;
@@ -44,9 +37,15 @@ public unsafe partial struct ImGuiIO
4437
public byte ConfigWindowsResizeFromEdges;
4538
public byte ConfigWindowsMoveFromTitleBarOnly;
4639
public float ConfigMemoryCompactTimer;
40+
public float MouseDoubleClickTime;
41+
public float MouseDoubleClickMaxDist;
42+
public float MouseDragThreshold;
43+
public float KeyRepeatDelay;
44+
public float KeyRepeatRate;
4745
public byte ConfigDebugBeginReturnValueOnce;
4846
public byte ConfigDebugBeginReturnValueLoop;
4947
public byte ConfigDebugIgnoreFocusLoss;
48+
public byte ConfigDebugIniSettings;
5049
public byte* BackendPlatformName;
5150
public byte* BackendRendererName;
5251
public void* BackendPlatformUserData;
@@ -785,13 +784,6 @@ public unsafe partial struct ImGuiIOPtr
785784
public ref float IniSavingRate => ref Unsafe.AsRef<float>(&NativePtr->IniSavingRate);
786785
public NullTerminatedString IniFilename => new NullTerminatedString(NativePtr->IniFilename);
787786
public NullTerminatedString LogFilename => new NullTerminatedString(NativePtr->LogFilename);
788-
public ref float MouseDoubleClickTime => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickTime);
789-
public ref float MouseDoubleClickMaxDist => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickMaxDist);
790-
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
791-
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
792-
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
793-
public ref float HoverDelayNormal => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayNormal);
794-
public ref float HoverDelayShort => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayShort);
795787
public IntPtr UserData { get => (IntPtr)NativePtr->UserData; set => NativePtr->UserData = (void*)value; }
796788
public ImFontAtlasPtr Fonts => new ImFontAtlasPtr(NativePtr->Fonts);
797789
public ref float FontGlobalScale => ref Unsafe.AsRef<float>(&NativePtr->FontGlobalScale);
@@ -815,9 +807,15 @@ public unsafe partial struct ImGuiIOPtr
815807
public ref bool ConfigWindowsResizeFromEdges => ref Unsafe.AsRef<bool>(&NativePtr->ConfigWindowsResizeFromEdges);
816808
public ref bool ConfigWindowsMoveFromTitleBarOnly => ref Unsafe.AsRef<bool>(&NativePtr->ConfigWindowsMoveFromTitleBarOnly);
817809
public ref float ConfigMemoryCompactTimer => ref Unsafe.AsRef<float>(&NativePtr->ConfigMemoryCompactTimer);
810+
public ref float MouseDoubleClickTime => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickTime);
811+
public ref float MouseDoubleClickMaxDist => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickMaxDist);
812+
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
813+
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
814+
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
818815
public ref bool ConfigDebugBeginReturnValueOnce => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueOnce);
819816
public ref bool ConfigDebugBeginReturnValueLoop => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueLoop);
820817
public ref bool ConfigDebugIgnoreFocusLoss => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIgnoreFocusLoss);
818+
public ref bool ConfigDebugIniSettings => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIniSettings);
821819
public NullTerminatedString BackendPlatformName => new NullTerminatedString(NativePtr->BackendPlatformName);
822820
public NullTerminatedString BackendRendererName => new NullTerminatedString(NativePtr->BackendRendererName);
823821
public IntPtr BackendPlatformUserData { get => (IntPtr)NativePtr->BackendPlatformUserData; set => NativePtr->BackendPlatformUserData = (void*)value; }

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public static unsafe partial class ImGuiNative
3131
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
3232
public static extern void igBeginGroup();
3333
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
34+
public static extern byte igBeginItemTooltip();
35+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
3436
public static extern byte igBeginListBox(byte* label, Vector2 size);
3537
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
3638
public static extern byte igBeginMainMenuBar();
@@ -563,10 +565,10 @@ public static unsafe partial class ImGuiNative
563565
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
564566
public static extern byte igSetDragDropPayload(byte* type, void* data, uint sz, ImGuiCond cond);
565567
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
566-
public static extern void igSetItemAllowOverlap();
567-
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
568568
public static extern void igSetItemDefaultFocus();
569569
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
570+
public static extern void igSetItemTooltip(byte* fmt);
571+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
570572
public static extern void igSetKeyboardFocusHere(int offset);
571573
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
572574
public static extern void igSetMouseCursor(ImGuiMouseCursor cursor_type);
@@ -575,6 +577,8 @@ public static unsafe partial class ImGuiNative
575577
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
576578
public static extern void igSetNextFrameWantCaptureMouse(byte want_capture_mouse);
577579
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
580+
public static extern void igSetNextItemAllowOverlap();
581+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
578582
public static extern void igSetNextItemOpen(byte is_open, ImGuiCond cond);
579583
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
580584
public static extern void igSetNextItemWidth(float item_width);

‎src/ImGui.NET/Generated/ImGuiSelectableFlags.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public enum ImGuiSelectableFlags
88
SpanAllColumns = 2,
99
AllowDoubleClick = 4,
1010
Disabled = 8,
11-
AllowItemOverlap = 16,
11+
AllowOverlap = 16,
1212
}
1313
}

‎src/ImGui.NET/Generated/ImGuiStyle.gen.cs

+10
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ public unsafe partial struct ImGuiStyle
105105
public Vector4 Colors_52;
106106
public Vector4 Colors_53;
107107
public Vector4 Colors_54;
108+
public float HoverStationaryDelay;
109+
public float HoverDelayShort;
110+
public float HoverDelayNormal;
111+
public ImGuiHoveredFlags HoverFlagsForTooltipMouse;
112+
public ImGuiHoveredFlags HoverFlagsForTooltipNav;
108113
}
109114
public unsafe partial struct ImGuiStylePtr
110115
{
@@ -158,6 +163,11 @@ public unsafe partial struct ImGuiStylePtr
158163
public ref float CurveTessellationTol => ref Unsafe.AsRef<float>(&NativePtr->CurveTessellationTol);
159164
public ref float CircleTessellationMaxError => ref Unsafe.AsRef<float>(&NativePtr->CircleTessellationMaxError);
160165
public RangeAccessor<Vector4> Colors => new RangeAccessor<Vector4>(&NativePtr->Colors_0, 55);
166+
public ref float HoverStationaryDelay => ref Unsafe.AsRef<float>(&NativePtr->HoverStationaryDelay);
167+
public ref float HoverDelayShort => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayShort);
168+
public ref float HoverDelayNormal => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayNormal);
169+
public ref ImGuiHoveredFlags HoverFlagsForTooltipMouse => ref Unsafe.AsRef<ImGuiHoveredFlags>(&NativePtr->HoverFlagsForTooltipMouse);
170+
public ref ImGuiHoveredFlags HoverFlagsForTooltipNav => ref Unsafe.AsRef<ImGuiHoveredFlags>(&NativePtr->HoverFlagsForTooltipNav);
161171
public void Destroy()
162172
{
163173
ImGuiNative.ImGuiStyle_destroy((ImGuiStyle*)(NativePtr));

‎src/ImGui.NET/Generated/ImGuiTreeNodeFlags.gen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public enum ImGuiTreeNodeFlags
66
None = 0,
77
Selected = 1,
88
Framed = 2,
9-
AllowItemOverlap = 4,
9+
AllowOverlap = 4,
1010
NoTreePushOnOpen = 8,
1111
NoAutoOpenOnLog = 16,
1212
DefaultOpen = 32,

‎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.6.0</AssemblyVersion>
4+
<AssemblyVersion>1.89.7.1</AssemblyVersion>
55
<Authors>Eric Mellino</Authors>
66
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)