Skip to content

Commit

Permalink
Merge pull request #419 from ImGuiNET/f/upgrade
Browse files Browse the repository at this point in the history
Upgrade to 1.89.7
  • Loading branch information
zaafar committed Jul 4, 2023
2 parents 159dd28 + 6e3a80a commit 0ea06bb
Show file tree
Hide file tree
Showing 15 changed files with 47,752 additions and 47,502 deletions.
Binary file modified deps/cimgui/linux-x64/cimgui.so
Binary file not shown.
Binary file modified deps/cimgui/osx/cimgui.dylib
Binary file not shown.
Binary file modified deps/cimgui/win-arm64/cimgui.dll
Binary file not shown.
Binary file modified deps/cimgui/win-x64/cimgui.dll
Binary file not shown.
Binary file modified deps/cimgui/win-x86/cimgui.dll
Binary file not shown.
73,869 changes: 36,980 additions & 36,889 deletions src/CodeGenerator/definitions/cimgui/definitions.json

Large diffs are not rendered by default.

21,273 changes: 10,690 additions & 10,583 deletions src/CodeGenerator/definitions/cimgui/structs_and_enums.json

Large diffs are not rendered by default.

43 changes: 39 additions & 4 deletions src/ImGui.NET/Generated/ImGui.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,11 @@ public static void BeginGroup()
{
ImGuiNative.igBeginGroup();
}
public static bool BeginItemTooltip()
{
byte ret = ImGuiNative.igBeginItemTooltip();
return ret != 0;
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static bool BeginListBox(ReadOnlySpan<char> label)
#else
Expand Down Expand Up @@ -11855,14 +11860,40 @@ public static bool SetDragDropPayload(string type, IntPtr data, uint sz, ImGuiCo
}
return ret != 0;
}
public static void SetItemAllowOverlap()
{
ImGuiNative.igSetItemAllowOverlap();
}
public static void SetItemDefaultFocus()
{
ImGuiNative.igSetItemDefaultFocus();
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
public static void SetItemTooltip(ReadOnlySpan<char> fmt)
#else
public static void SetItemTooltip(string fmt)
#endif
{
byte* native_fmt;
int fmt_byteCount = 0;
if (fmt != null)
{
fmt_byteCount = Encoding.UTF8.GetByteCount(fmt);
if (fmt_byteCount > Util.StackAllocationSizeLimit)
{
native_fmt = Util.Allocate(fmt_byteCount + 1);
}
else
{
byte* native_fmt_stackBytes = stackalloc byte[fmt_byteCount + 1];
native_fmt = native_fmt_stackBytes;
}
int native_fmt_offset = Util.GetUtf8(fmt, native_fmt, fmt_byteCount);
native_fmt[native_fmt_offset] = 0;
}
else { native_fmt = null; }
ImGuiNative.igSetItemTooltip(native_fmt);
if (fmt_byteCount > Util.StackAllocationSizeLimit)
{
Util.Free(native_fmt);
}
}
public static void SetKeyboardFocusHere()
{
int offset = 0;
Expand All @@ -11886,6 +11917,10 @@ public static void SetNextFrameWantCaptureMouse(bool want_capture_mouse)
byte native_want_capture_mouse = want_capture_mouse ? (byte)1 : (byte)0;
ImGuiNative.igSetNextFrameWantCaptureMouse(native_want_capture_mouse);
}
public static void SetNextItemAllowOverlap()
{
ImGuiNative.igSetNextItemAllowOverlap();
}
public static void SetNextItemOpen(bool is_open)
{
byte native_is_open = is_open ? (byte)1 : (byte)0;
Expand Down
19 changes: 12 additions & 7 deletions src/ImGui.NET/Generated/ImGuiHoveredFlags.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@ public enum ImGuiHoveredFlags
DockHierarchy = 16,
AllowWhenBlockedByPopup = 32,
AllowWhenBlockedByActiveItem = 128,
AllowWhenOverlapped = 256,
AllowWhenDisabled = 512,
NoNavOverride = 1024,
RectOnly = 416,
AllowWhenOverlappedByItem = 256,
AllowWhenOverlappedByWindow = 512,
AllowWhenDisabled = 1024,
NoNavOverride = 2048,
AllowWhenOverlapped = 768,
RectOnly = 928,
RootAndChildWindows = 3,
DelayNormal = 2048,
DelayShort = 4096,
NoSharedDelay = 8192,
ForTooltip = 2048,
Stationary = 4096,
DelayNone = 8192,
DelayShort = 16384,
DelayNormal = 32768,
NoSharedDelay = 65536,
}
}
26 changes: 12 additions & 14 deletions src/ImGui.NET/Generated/ImGuiIO.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ public unsafe partial struct ImGuiIO
public float IniSavingRate;
public byte* IniFilename;
public byte* LogFilename;
public float MouseDoubleClickTime;
public float MouseDoubleClickMaxDist;
public float MouseDragThreshold;
public float KeyRepeatDelay;
public float KeyRepeatRate;
public float HoverDelayNormal;
public float HoverDelayShort;
public void* UserData;
public ImFontAtlas* Fonts;
public float FontGlobalScale;
Expand All @@ -44,9 +37,15 @@ public unsafe partial struct ImGuiIO
public byte ConfigWindowsResizeFromEdges;
public byte ConfigWindowsMoveFromTitleBarOnly;
public float ConfigMemoryCompactTimer;
public float MouseDoubleClickTime;
public float MouseDoubleClickMaxDist;
public float MouseDragThreshold;
public float KeyRepeatDelay;
public float KeyRepeatRate;
public byte ConfigDebugBeginReturnValueOnce;
public byte ConfigDebugBeginReturnValueLoop;
public byte ConfigDebugIgnoreFocusLoss;
public byte ConfigDebugIniSettings;
public byte* BackendPlatformName;
public byte* BackendRendererName;
public void* BackendPlatformUserData;
Expand Down Expand Up @@ -785,13 +784,6 @@ public unsafe partial struct ImGuiIOPtr
public ref float IniSavingRate => ref Unsafe.AsRef<float>(&NativePtr->IniSavingRate);
public NullTerminatedString IniFilename => new NullTerminatedString(NativePtr->IniFilename);
public NullTerminatedString LogFilename => new NullTerminatedString(NativePtr->LogFilename);
public ref float MouseDoubleClickTime => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickTime);
public ref float MouseDoubleClickMaxDist => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickMaxDist);
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
public ref float HoverDelayNormal => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayNormal);
public ref float HoverDelayShort => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayShort);
public IntPtr UserData { get => (IntPtr)NativePtr->UserData; set => NativePtr->UserData = (void*)value; }
public ImFontAtlasPtr Fonts => new ImFontAtlasPtr(NativePtr->Fonts);
public ref float FontGlobalScale => ref Unsafe.AsRef<float>(&NativePtr->FontGlobalScale);
Expand All @@ -815,9 +807,15 @@ public unsafe partial struct ImGuiIOPtr
public ref bool ConfigWindowsResizeFromEdges => ref Unsafe.AsRef<bool>(&NativePtr->ConfigWindowsResizeFromEdges);
public ref bool ConfigWindowsMoveFromTitleBarOnly => ref Unsafe.AsRef<bool>(&NativePtr->ConfigWindowsMoveFromTitleBarOnly);
public ref float ConfigMemoryCompactTimer => ref Unsafe.AsRef<float>(&NativePtr->ConfigMemoryCompactTimer);
public ref float MouseDoubleClickTime => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickTime);
public ref float MouseDoubleClickMaxDist => ref Unsafe.AsRef<float>(&NativePtr->MouseDoubleClickMaxDist);
public ref float MouseDragThreshold => ref Unsafe.AsRef<float>(&NativePtr->MouseDragThreshold);
public ref float KeyRepeatDelay => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatDelay);
public ref float KeyRepeatRate => ref Unsafe.AsRef<float>(&NativePtr->KeyRepeatRate);
public ref bool ConfigDebugBeginReturnValueOnce => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueOnce);
public ref bool ConfigDebugBeginReturnValueLoop => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugBeginReturnValueLoop);
public ref bool ConfigDebugIgnoreFocusLoss => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIgnoreFocusLoss);
public ref bool ConfigDebugIniSettings => ref Unsafe.AsRef<bool>(&NativePtr->ConfigDebugIniSettings);
public NullTerminatedString BackendPlatformName => new NullTerminatedString(NativePtr->BackendPlatformName);
public NullTerminatedString BackendRendererName => new NullTerminatedString(NativePtr->BackendRendererName);
public IntPtr BackendPlatformUserData { get => (IntPtr)NativePtr->BackendPlatformUserData; set => NativePtr->BackendPlatformUserData = (void*)value; }
Expand Down
8 changes: 6 additions & 2 deletions src/ImGui.NET/Generated/ImGuiNative.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ public static unsafe partial class ImGuiNative
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igBeginGroup();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igBeginItemTooltip();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igBeginListBox(byte* label, Vector2 size);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igBeginMainMenuBar();
Expand Down Expand Up @@ -563,10 +565,10 @@ public static unsafe partial class ImGuiNative
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern byte igSetDragDropPayload(byte* type, void* data, uint sz, ImGuiCond cond);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetItemAllowOverlap();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetItemDefaultFocus();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetItemTooltip(byte* fmt);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetKeyboardFocusHere(int offset);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetMouseCursor(ImGuiMouseCursor cursor_type);
Expand All @@ -575,6 +577,8 @@ public static unsafe partial class ImGuiNative
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextFrameWantCaptureMouse(byte want_capture_mouse);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextItemAllowOverlap();
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextItemOpen(byte is_open, ImGuiCond cond);
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
public static extern void igSetNextItemWidth(float item_width);
Expand Down
2 changes: 1 addition & 1 deletion src/ImGui.NET/Generated/ImGuiSelectableFlags.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public enum ImGuiSelectableFlags
SpanAllColumns = 2,
AllowDoubleClick = 4,
Disabled = 8,
AllowItemOverlap = 16,
AllowOverlap = 16,
}
}
10 changes: 10 additions & 0 deletions src/ImGui.NET/Generated/ImGuiStyle.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ public unsafe partial struct ImGuiStyle
public Vector4 Colors_52;
public Vector4 Colors_53;
public Vector4 Colors_54;
public float HoverStationaryDelay;
public float HoverDelayShort;
public float HoverDelayNormal;
public ImGuiHoveredFlags HoverFlagsForTooltipMouse;
public ImGuiHoveredFlags HoverFlagsForTooltipNav;
}
public unsafe partial struct ImGuiStylePtr
{
Expand Down Expand Up @@ -158,6 +163,11 @@ public unsafe partial struct ImGuiStylePtr
public ref float CurveTessellationTol => ref Unsafe.AsRef<float>(&NativePtr->CurveTessellationTol);
public ref float CircleTessellationMaxError => ref Unsafe.AsRef<float>(&NativePtr->CircleTessellationMaxError);
public RangeAccessor<Vector4> Colors => new RangeAccessor<Vector4>(&NativePtr->Colors_0, 55);
public ref float HoverStationaryDelay => ref Unsafe.AsRef<float>(&NativePtr->HoverStationaryDelay);
public ref float HoverDelayShort => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayShort);
public ref float HoverDelayNormal => ref Unsafe.AsRef<float>(&NativePtr->HoverDelayNormal);
public ref ImGuiHoveredFlags HoverFlagsForTooltipMouse => ref Unsafe.AsRef<ImGuiHoveredFlags>(&NativePtr->HoverFlagsForTooltipMouse);
public ref ImGuiHoveredFlags HoverFlagsForTooltipNav => ref Unsafe.AsRef<ImGuiHoveredFlags>(&NativePtr->HoverFlagsForTooltipNav);
public void Destroy()
{
ImGuiNative.ImGuiStyle_destroy((ImGuiStyle*)(NativePtr));
Expand Down
2 changes: 1 addition & 1 deletion src/ImGui.NET/Generated/ImGuiTreeNodeFlags.gen.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public enum ImGuiTreeNodeFlags
None = 0,
Selected = 1,
Framed = 2,
AllowItemOverlap = 4,
AllowOverlap = 4,
NoTreePushOnOpen = 8,
NoAutoOpenOnLog = 16,
DefaultOpen = 32,
Expand Down
2 changes: 1 addition & 1 deletion src/ImGui.NET/ImGui.NET.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A .NET wrapper for the Dear ImGui library.</Description>
<AssemblyVersion>1.89.6.0</AssemblyVersion>
<AssemblyVersion>1.89.7.1</AssemblyVersion>
<Authors>Eric Mellino</Authors>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down

0 comments on commit 0ea06bb

Please sign in to comment.