Skip to content

Commit 38cfb79

Browse files
authored
Merge pull request #386 from mellinoe/f/bug-fix
Fixed the issue were AddFontDefault stopped working
2 parents 378bb72 + 100eac4 commit 38cfb79

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public unsafe partial struct ImFontAtlas
1212
public int TexDesiredWidth;
1313
public int TexGlyphPadding;
1414
public byte Locked;
15+
public void* UserData;
1516
public byte TexReady;
1617
public byte TexPixelsUseColors;
1718
public byte* TexPixelsAlpha8;
@@ -105,6 +106,7 @@ public unsafe partial struct ImFontAtlasPtr
105106
public ref int TexDesiredWidth => ref Unsafe.AsRef<int>(&NativePtr->TexDesiredWidth);
106107
public ref int TexGlyphPadding => ref Unsafe.AsRef<int>(&NativePtr->TexGlyphPadding);
107108
public ref bool Locked => ref Unsafe.AsRef<bool>(&NativePtr->Locked);
109+
public IntPtr UserData { get => (IntPtr)NativePtr->UserData; set => NativePtr->UserData = (void*)value; }
108110
public ref bool TexReady => ref Unsafe.AsRef<bool>(&NativePtr->TexReady);
109111
public ref bool TexPixelsUseColors => ref Unsafe.AsRef<bool>(&NativePtr->TexPixelsUseColors);
110112
public IntPtr TexPixelsAlpha8 { get => (IntPtr)NativePtr->TexPixelsAlpha8; set => NativePtr->TexPixelsAlpha8 = (byte*)value; }

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6397,6 +6397,11 @@ public static ImGuiIOPtr GetIO()
63976397
ImGuiIO* ret = ImGuiNative.igGetIO();
63986398
return new ImGuiIOPtr(ret);
63996399
}
6400+
public static uint GetItemID()
6401+
{
6402+
uint ret = ImGuiNative.igGetItemID();
6403+
return ret;
6404+
}
64006405
public static Vector2 GetItemRectMax()
64016406
{
64026407
Vector2 __retval;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ public enum ImGuiKey
149149
ModShift = 8192,
150150
ModAlt = 16384,
151151
ModSuper = 32768,
152-
ModMask = 61440,
153-
ModShortcut = 4096,
152+
ModShortcut = 2048,
153+
ModMask = 63488,
154154
NamedKey_BEGIN = 512,
155155
NamedKey_END = 652,
156156
NamedKey_COUNT = 140,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ public static unsafe partial class ImGuiNative
251251
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
252252
public static extern ImGuiIO* igGetIO();
253253
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
254+
public static extern uint igGetItemID();
255+
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
254256
public static extern void igGetItemRectMax(Vector2* pOut);
255257
[DllImport("cimgui", CallingConvention = CallingConvention.Cdecl)]
256258
public static extern void igGetItemRectMin(Vector2* pOut);

0 commit comments

Comments
 (0)