Skip to content

Commit 77383b5

Browse files
zaafarzaafar
authored
upgrade imgui.net to use imgui 1.90.7 (#480)
1 parent 0b2d0f8 commit 77383b5

File tree

13 files changed

+1871
-1721
lines changed

13 files changed

+1871
-1721
lines changed

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

8.39 KB
Binary file not shown.

‎deps/cimgui/osx/cimgui.dylib

368 Bytes
Binary file not shown.

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

-5.5 KB
Binary file not shown.

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

-5.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

+1,528-1,470
Large diffs are not rendered by default.

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

+271-231
Large diffs are not rendered by default.

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

+44-15
Original file line numberDiff line numberDiff line change
@@ -4588,61 +4588,70 @@ public static void DestroyPlatformWindows()
45884588
{
45894589
ImGuiNative.igDestroyPlatformWindows();
45904590
}
4591-
public static uint DockSpace(uint id)
4591+
public static uint DockSpace(uint dockspace_id)
45924592
{
45934593
Vector2 size = new Vector2();
45944594
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
45954595
ImGuiWindowClass* window_class = null;
4596-
uint ret = ImGuiNative.igDockSpace(id, size, flags, window_class);
4596+
uint ret = ImGuiNative.igDockSpace(dockspace_id, size, flags, window_class);
45974597
return ret;
45984598
}
4599-
public static uint DockSpace(uint id, Vector2 size)
4599+
public static uint DockSpace(uint dockspace_id, Vector2 size)
46004600
{
46014601
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
46024602
ImGuiWindowClass* window_class = null;
4603-
uint ret = ImGuiNative.igDockSpace(id, size, flags, window_class);
4603+
uint ret = ImGuiNative.igDockSpace(dockspace_id, size, flags, window_class);
46044604
return ret;
46054605
}
4606-
public static uint DockSpace(uint id, Vector2 size, ImGuiDockNodeFlags flags)
4606+
public static uint DockSpace(uint dockspace_id, Vector2 size, ImGuiDockNodeFlags flags)
46074607
{
46084608
ImGuiWindowClass* window_class = null;
4609-
uint ret = ImGuiNative.igDockSpace(id, size, flags, window_class);
4609+
uint ret = ImGuiNative.igDockSpace(dockspace_id, size, flags, window_class);
46104610
return ret;
46114611
}
4612-
public static uint DockSpace(uint id, Vector2 size, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
4612+
public static uint DockSpace(uint dockspace_id, Vector2 size, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
46134613
{
46144614
ImGuiWindowClass* native_window_class = window_class.NativePtr;
4615-
uint ret = ImGuiNative.igDockSpace(id, size, flags, native_window_class);
4615+
uint ret = ImGuiNative.igDockSpace(dockspace_id, size, flags, native_window_class);
46164616
return ret;
46174617
}
46184618
public static uint DockSpaceOverViewport()
46194619
{
4620+
uint dockspace_id = 0;
46204621
ImGuiViewport* viewport = null;
46214622
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
46224623
ImGuiWindowClass* window_class = null;
4623-
uint ret = ImGuiNative.igDockSpaceOverViewport(viewport, flags, window_class);
4624+
uint ret = ImGuiNative.igDockSpaceOverViewport(dockspace_id, viewport, flags, window_class);
46244625
return ret;
46254626
}
4626-
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport)
4627+
public static uint DockSpaceOverViewport(uint dockspace_id)
4628+
{
4629+
ImGuiViewport* viewport = null;
4630+
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
4631+
ImGuiWindowClass* window_class = null;
4632+
uint ret = ImGuiNative.igDockSpaceOverViewport(dockspace_id, viewport, flags, window_class);
4633+
return ret;
4634+
}
4635+
public static uint DockSpaceOverViewport(uint dockspace_id, ImGuiViewportPtr viewport)
46274636
{
46284637
ImGuiViewport* native_viewport = viewport.NativePtr;
46294638
ImGuiDockNodeFlags flags = (ImGuiDockNodeFlags)0;
46304639
ImGuiWindowClass* window_class = null;
4631-
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, window_class);
4640+
uint ret = ImGuiNative.igDockSpaceOverViewport(dockspace_id, native_viewport, flags, window_class);
46324641
return ret;
46334642
}
4634-
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags)
4643+
public static uint DockSpaceOverViewport(uint dockspace_id, ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags)
46354644
{
46364645
ImGuiViewport* native_viewport = viewport.NativePtr;
46374646
ImGuiWindowClass* window_class = null;
4638-
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, window_class);
4647+
uint ret = ImGuiNative.igDockSpaceOverViewport(dockspace_id, native_viewport, flags, window_class);
46394648
return ret;
46404649
}
4641-
public static uint DockSpaceOverViewport(ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
4650+
public static uint DockSpaceOverViewport(uint dockspace_id, ImGuiViewportPtr viewport, ImGuiDockNodeFlags flags, ImGuiWindowClassPtr window_class)
46424651
{
46434652
ImGuiViewport* native_viewport = viewport.NativePtr;
46444653
ImGuiWindowClass* native_window_class = window_class.NativePtr;
4645-
uint ret = ImGuiNative.igDockSpaceOverViewport(native_viewport, flags, native_window_class);
4654+
uint ret = ImGuiNative.igDockSpaceOverViewport(dockspace_id, native_viewport, flags, native_window_class);
46464655
return ret;
46474656
}
46484657
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP2_1_OR_GREATER
@@ -21232,6 +21241,15 @@ public static void SetNextItemOpen(bool is_open, ImGuiCond cond)
2123221241
byte native_is_open = is_open ? (byte)1 : (byte)0;
2123321242
ImGuiNative.igSetNextItemOpen(native_is_open, cond);
2123421243
}
21244+
public static void SetNextItemShortcut(ImGuiKey key_chord)
21245+
{
21246+
ImGuiInputFlags flags = (ImGuiInputFlags)0;
21247+
ImGuiNative.igSetNextItemShortcut(key_chord, flags);
21248+
}
21249+
public static void SetNextItemShortcut(ImGuiKey key_chord, ImGuiInputFlags flags)
21250+
{
21251+
ImGuiNative.igSetNextItemShortcut(key_chord, flags);
21252+
}
2123521253
public static void SetNextItemWidth(float item_width)
2123621254
{
2123721255
ImGuiNative.igSetNextItemWidth(item_width);
@@ -21903,6 +21921,17 @@ public static void SetWindowSize(string name, Vector2 size, ImGuiCond cond)
2190321921
Util.Free(native_name);
2190421922
}
2190521923
}
21924+
public static bool Shortcut(ImGuiKey key_chord)
21925+
{
21926+
ImGuiInputFlags flags = (ImGuiInputFlags)0;
21927+
byte ret = ImGuiNative.igShortcut_Nil(key_chord, flags);
21928+
return ret != 0;
21929+
}
21930+
public static bool Shortcut(ImGuiKey key_chord, ImGuiInputFlags flags)
21931+
{
21932+
byte ret = ImGuiNative.igShortcut_Nil(key_chord, flags);
21933+
return ret != 0;
21934+
}
2190621935
public static void ShowAboutWindow()
2190721936
{
2190821937
byte* p_open = null;

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

+2
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ public unsafe partial struct ImGuiIO
252252
public fixed byte MouseDownOwned[5];
253253
public fixed byte MouseDownOwnedUnlessPopupClose[5];
254254
public byte MouseWheelRequestAxisSwap;
255+
public byte MouseCtrlLeftAsRightClick;
255256
public fixed float MouseDownDuration[5];
256257
public fixed float MouseDownDurationPrev[5];
257258
public Vector2 MouseDragMaxDistanceAbs_0;
@@ -364,6 +365,7 @@ public unsafe partial struct ImGuiIOPtr
364365
public RangeAccessor<bool> MouseDownOwned => new RangeAccessor<bool>(NativePtr->MouseDownOwned, 5);
365366
public RangeAccessor<bool> MouseDownOwnedUnlessPopupClose => new RangeAccessor<bool>(NativePtr->MouseDownOwnedUnlessPopupClose, 5);
366367
public ref bool MouseWheelRequestAxisSwap => ref Unsafe.AsRef<bool>(&NativePtr->MouseWheelRequestAxisSwap);
368+
public ref bool MouseCtrlLeftAsRightClick => ref Unsafe.AsRef<bool>(&NativePtr->MouseCtrlLeftAsRightClick);
367369
public RangeAccessor<float> MouseDownDuration => new RangeAccessor<float>(NativePtr->MouseDownDuration, 5);
368370
public RangeAccessor<float> MouseDownDurationPrev => new RangeAccessor<float>(NativePtr->MouseDownDurationPrev, 5);
369371
public RangeAccessor<Vector2> MouseDragMaxDistanceAbs => new RangeAccessor<Vector2>(&NativePtr->MouseDragMaxDistanceAbs_0, 5);

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

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
namespace ImGuiNET
2+
{
3+
[System.Flags]
4+
public enum ImGuiInputFlags
5+
{
6+
None = 0,
7+
Repeat = 1,
8+
RouteActive = 1024,
9+
RouteFocused = 2048,
10+
RouteGlobal = 4096,
11+
RouteAlways = 8192,
12+
RouteOverFocused = 16384,
13+
RouteOverActive = 32768,
14+
RouteUnlessBgFocused = 65536,
15+
RouteFromRootWindow = 131072,
16+
Tooltip = 262144,
17+
}
18+
}

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ public enum ImGuiKey
163163
ModShift = 8192,
164164
ModAlt = 16384,
165165
ModSuper = 32768,
166-
ModShortcut = 2048,
167-
ModMask = 63488,
166+
ModMask = 61440,
168167
NamedKey_BEGIN = 512,
169168
NamedKey_END = 666,
170169
NamedKey_COUNT = 154,

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ public static unsafe partial class ImGuiNative
117117
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
118118
public static extern void igDestroyPlatformWindows();
119119
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
120-
public static extern uint igDockSpace(uint id, Vector2 size, ImGuiDockNodeFlags flags, ImGuiWindowClass* window_class);
120+
public static extern uint igDockSpace(uint dockspace_id, Vector2 size, ImGuiDockNodeFlags flags, ImGuiWindowClass* window_class);
121121
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
122-
public static extern uint igDockSpaceOverViewport(ImGuiViewport* viewport, ImGuiDockNodeFlags flags, ImGuiWindowClass* window_class);
122+
public static extern uint igDockSpaceOverViewport(uint dockspace_id, ImGuiViewport* viewport, ImGuiDockNodeFlags flags, ImGuiWindowClass* window_class);
123123
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
124124
public static extern byte igDragFloat(byte* label, float* v, float v_speed, float v_min, float v_max, byte* format, ImGuiSliderFlags flags);
125125
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
@@ -581,6 +581,8 @@ public static unsafe partial class ImGuiNative
581581
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
582582
public static extern void igSetNextItemOpen(byte is_open, ImGuiCond cond);
583583
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
584+
public static extern void igSetNextItemShortcut(ImGuiKey key_chord, ImGuiInputFlags flags);
585+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
584586
public static extern void igSetNextItemWidth(float item_width);
585587
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
586588
public static extern void igSetNextWindowBgAlpha(float alpha);
@@ -641,6 +643,8 @@ public static unsafe partial class ImGuiNative
641643
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
642644
public static extern void igSetWindowSize_Str(byte* name, Vector2 size, ImGuiCond cond);
643645
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
646+
public static extern byte igShortcut_Nil(ImGuiKey key_chord, ImGuiInputFlags flags);
647+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
644648
public static extern void igShowAboutWindow(byte* p_open);
645649
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
646650
public static extern void igShowDebugLogWindow(byte* p_open);

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

0 commit comments

Comments
 (0)