Skip to content

Commit 6bcaa1c

Browse files
committed
Updated to Dear ImGui 1.92.3
1 parent 7999720 commit 6bcaa1c

File tree

101 files changed

+109947
-51219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+109947
-51219
lines changed

Generator/Targets/ImGuiBaseTarget.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ protected void Generate(IEnumerable<string> headers, string settingsPath, string
3737
var builder = GeneratorBuilder.Create<ImGuiCodeGenerator>(settingsPath)
3838
.AlterConfig(config =>
3939
{
40+
if (config.ApiName == "ImPlot3D") // Fix for ImPlot3D not generating those overloads correctly
41+
{
42+
config.FunctionTableEntries = [
43+
new(0, "igSetCurrentContext"),
44+
new(1, "igGetCurrentContext"),
45+
new(2, "igSetAllocatorFunctions"),
46+
new(3, "igGetAllocatorFunctions")];
47+
}
4048
config.WrapPointersAsHandle = true;
4149
})
4250
.WithPrePatch<ImVectorPatch>()

Generator/cimgui/cimgui.h

Lines changed: 49 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
2-
//based on imgui.h file version "1.92.2b" 19222 from Dear ImGui https://github.com/ocornut/imgui
2+
//based on imgui.h file version "1.92.3" 19230 from Dear ImGui https://github.com/ocornut/imgui
33
//with imgui_internal.h api
44
//with imgui_freetype.h api
55
//docking branch
@@ -206,6 +206,7 @@ typedef int ImGuiStyleVar;
206206
typedef int ImGuiTableBgTarget;
207207
typedef int ImDrawFlags;
208208
typedef int ImDrawListFlags;
209+
typedef int ImDrawTextFlags;
209210
typedef int ImFontFlags;
210211
typedef int ImFontAtlasFlags;
211212
typedef int ImGuiBackendFlags;
@@ -222,6 +223,7 @@ typedef int ImGuiInputFlags;
222223
typedef int ImGuiInputTextFlags;
223224
typedef int ImGuiItemFlags;
224225
typedef int ImGuiKeyChord;
226+
typedef int ImGuiListClipperFlags;
225227
typedef int ImGuiPopupFlags;
226228
typedef int ImGuiMultiSelectFlags;
227229
typedef int ImGuiSelectableFlags;
@@ -354,6 +356,7 @@ typedef enum {
354356
ImGuiInputTextFlags_CallbackCharFilter = 1 << 21,
355357
ImGuiInputTextFlags_CallbackResize = 1 << 22,
356358
ImGuiInputTextFlags_CallbackEdit = 1 << 23,
359+
ImGuiInputTextFlags_WordWrap = 1 << 24,
357360
}ImGuiInputTextFlags_;
358361
typedef enum {
359362
ImGuiTreeNodeFlags_None = 0,
@@ -407,6 +410,7 @@ typedef enum {
407410
ImGuiSelectableFlags_Disabled = 1 << 3,
408411
ImGuiSelectableFlags_AllowOverlap = 1 << 4,
409412
ImGuiSelectableFlags_Highlight = 1 << 5,
413+
ImGuiSelectableFlags_SelectOnNav = 1 << 6,
410414

411415

412416

@@ -851,6 +855,7 @@ typedef enum {
851855
ImGuiStyleVar_CellPadding,
852856
ImGuiStyleVar_ScrollbarSize,
853857
ImGuiStyleVar_ScrollbarRounding,
858+
ImGuiStyleVar_ScrollbarPadding,
854859
ImGuiStyleVar_GrabMinSize,
855860
ImGuiStyleVar_GrabRounding,
856861
ImGuiStyleVar_ImageBorderSize,
@@ -1079,6 +1084,7 @@ struct ImGuiStyle
10791084
float ColumnsMinSpacing;
10801085
float ScrollbarSize;
10811086
float ScrollbarRounding;
1087+
float ScrollbarPadding;
10821088
float GrabMinSize;
10831089
float GrabRounding;
10841090
float LogSliderDeadzone;
@@ -1104,6 +1110,7 @@ struct ImGuiStyle
11041110
ImVec2 SeparatorTextPadding;
11051111
ImVec2 DisplayWindowPadding;
11061112
ImVec2 DisplaySafeAreaPadding;
1113+
bool DockingNodeHasCloseButton;
11071114
float DockingSeparatorSize;
11081115
float MouseCursorScale;
11091116
bool AntiAliasedLines;
@@ -1323,6 +1330,10 @@ struct ImGuiStorage
13231330
{
13241331
ImVector_ImGuiStoragePair Data;
13251332
};
1333+
typedef enum {
1334+
ImGuiListClipperFlags_None = 0,
1335+
ImGuiListClipperFlags_NoSetTableRowCounters = 1 << 0,
1336+
}ImGuiListClipperFlags_;
13261337
struct ImGuiListClipper
13271338
{
13281339
ImGuiContext* Ctx;
@@ -1333,6 +1344,7 @@ struct ImGuiListClipper
13331344
double StartPosY;
13341345
double StartSeekOffsetY;
13351346
void* TempData;
1347+
ImGuiListClipperFlags Flags;
13361348
};
13371349
struct ImColor
13381350
{
@@ -1841,6 +1853,7 @@ struct ImGuiWindowTempData;
18411853
struct ImGuiWindowSettings;
18421854
typedef int ImGuiDataAuthority;
18431855
typedef int ImGuiLayoutType;
1856+
typedef int ImDrawTextFlags;
18441857
typedef int ImGuiActivateFlags;
18451858
typedef int ImGuiDebugLogFlags;
18461859
typedef int ImGuiFocusRequestFlags;
@@ -1859,6 +1872,12 @@ typedef int ImGuiTypingSelectFlags;
18591872
typedef int ImGuiWindowRefreshFlags;
18601873
typedef ImS16 ImGuiTableColumnIdx;
18611874
typedef ImU16 ImGuiTableDrawChannelIdx;extern ImGuiContext* GImGui;
1875+
typedef enum {
1876+
ImDrawTextFlags_None = 0,
1877+
ImDrawTextFlags_CpuFineClip = 1 << 0,
1878+
ImDrawTextFlags_WrapKeepBlanks = 1 << 1,
1879+
ImDrawTextFlags_StopOnNewLine = 1 << 2,
1880+
}ImDrawTextFlags_;
18621881
typedef FILE* ImFileHandle;
18631882
typedef struct ImVec1 ImVec1;
18641883
struct ImVec1
@@ -1889,7 +1908,7 @@ typedef struct ImVector_int {int Size;int Capacity;int* Data;} ImVector_int;
18891908

18901909
struct ImGuiTextIndex
18911910
{
1892-
ImVector_int LineOffsets;
1911+
ImVector_int Offsets;
18931912
int EndOffset;
18941913
};
18951914
struct ImDrawListSharedData
@@ -2031,7 +2050,6 @@ typedef enum {
20312050
}ImGuiSliderFlagsPrivate_;
20322051
typedef enum {
20332052
ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20,
2034-
ImGuiSelectableFlags_SelectOnNav = 1 << 21,
20352053
ImGuiSelectableFlags_SelectOnClick = 1 << 22,
20362054
ImGuiSelectableFlags_SelectOnRelease = 1 << 23,
20372055
ImGuiSelectableFlags_SpanAvailWidth = 1 << 24,
@@ -2144,11 +2162,15 @@ struct ImGuiInputTextState
21442162
ImVector_char CallbackTextBackup;
21452163
int BufCapacity;
21462164
ImVec2 Scroll;
2165+
int LineCount;
2166+
float WrapWidth;
21472167
float CursorAnim;
21482168
bool CursorFollow;
2169+
bool CursorCenterY;
21492170
bool SelectedAllMouseLock;
21502171
bool Edited;
21512172
bool WantReloadUserBuf;
2173+
ImS8 LastMoveDirectionLR;
21522174
int ReloadSelectionStart;
21532175
int ReloadSelectionEnd;
21542176
};
@@ -2450,6 +2472,7 @@ typedef enum {
24502472
ImGuiActivateFlags_TryToPreserveState = 1 << 2,
24512473
ImGuiActivateFlags_FromTabbing = 1 << 3,
24522474
ImGuiActivateFlags_FromShortcut = 1 << 4,
2475+
ImGuiActivateFlags_FromFocusApi = 1 << 5,
24532476
}ImGuiActivateFlags_;
24542477
typedef enum {
24552478
ImGuiScrollFlags_None = 0,
@@ -2862,8 +2885,8 @@ struct ImGuiStackLevelInfo
28622885
ImGuiID ID;
28632886
ImS8 QueryFrameCount;
28642887
bool QuerySuccess;
2865-
ImGuiDataType DataType : 8;
2866-
char Desc[57];
2888+
ImS8 DataType;
2889+
int DescOffset;
28672890
};
28682891
typedef struct ImGuiIDStackTool ImGuiIDStackTool;
28692892
typedef struct ImVector_ImGuiStackLevelInfo {int Size;int Capacity;ImGuiStackLevelInfo* Data;} ImVector_ImGuiStackLevelInfo;
@@ -2872,11 +2895,14 @@ struct ImGuiIDStackTool
28722895
{
28732896
int LastActiveFrame;
28742897
int StackLevel;
2875-
ImGuiID QueryId;
2898+
ImGuiID QueryMainId;
28762899
ImVector_ImGuiStackLevelInfo Results;
2877-
bool CopyToClipboardOnCtrlC;
2900+
bool QueryHookActive;
2901+
bool OptHexEncodeNonAsciiChars;
2902+
bool OptCopyToClipboardOnCtrlC;
28782903
float CopyToClipboardLastTime;
2879-
ImGuiTextBuffer ResultPathBuf;
2904+
ImGuiTextBuffer ResultPathsBuf;
2905+
ImGuiTextBuffer ResultTempBuf;
28802906
};
28812907
typedef void (*ImGuiContextHookCallback)(ImGuiContext* ctx, ImGuiContextHook* hook);
28822908
typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ }ImGuiContextHookType;
@@ -3000,7 +3026,7 @@ struct ImGuiContext
30003026
ImVec2 WheelingWindowWheelRemainder;
30013027
ImVec2 WheelingAxisAvg;
30023028
ImGuiID DebugDrawIdConflictsId;
3003-
ImGuiID DebugHookIdInfo;
3029+
ImGuiID DebugHookIdInfoId;
30043030
ImGuiID HoveredId;
30053031
ImGuiID HoveredIdPreviousFrame;
30063032
int HoveredIdPreviousFrameItemCount;
@@ -3173,6 +3199,7 @@ struct ImGuiContext
31733199
float MouseStationaryTimer;
31743200
ImVec2 MouseLastValidPos;
31753201
ImGuiInputTextState InputTextState;
3202+
ImGuiTextIndex InputTextLineIndex;
31763203
ImGuiInputTextDeactivatedState InputTextDeactivatedState;
31773204
ImFontBaked InputTextPasswordFontBackupBaked;
31783205
ImFontFlags InputTextPasswordFontBackupFlags;
@@ -3747,7 +3774,7 @@ struct ImFontLoader
37473774
struct ImFontAtlasRectEntry
37483775
{
37493776
int TargetIndex : 20;
3750-
int Generation : 10;
3777+
unsigned int Generation : 10;
37513778
unsigned int IsUsed : 1;
37523779
};
37533780
struct ImFontAtlasPostProcessData
@@ -4624,10 +4651,10 @@ CIMGUI_API bool ImFont_IsGlyphInFont(ImFont* self,ImWchar c);
46244651
CIMGUI_API bool ImFont_IsLoaded(ImFont* self);
46254652
CIMGUI_API const char* ImFont_GetDebugName(ImFont* self);
46264653
CIMGUI_API ImFontBaked* ImFont_GetFontBaked(ImFont* self,float font_size,float density);
4627-
CIMGUI_API void ImFont_CalcTextSizeA(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** remaining);
4654+
CIMGUI_API void ImFont_CalcTextSizeA(ImVec2 *pOut,ImFont* self,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end,const char** out_remaining);
46284655
CIMGUI_API const char* ImFont_CalcWordWrapPosition(ImFont* self,float size,const char* text,const char* text_end,float wrap_width);
46294656
CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,const ImVec2 pos,ImU32 col,ImWchar c,const ImVec4* cpu_fine_clip);
4630-
CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,const ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,bool cpu_fine_clip);
4657+
CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,const ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,ImDrawTextFlags flags);
46314658
CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
46324659
CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar from_codepoint,ImWchar to_codepoint);
46334660
CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsigned int c_last);
@@ -4643,6 +4670,7 @@ CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void)
46434670
CIMGUI_API void ImGuiPlatformImeData_destroy(ImGuiPlatformImeData* self);
46444671
CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImGuiID seed);
46454672
CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImGuiID seed);
4673+
CIMGUI_API const char* igImHashSkipUncontributingPrefix(const char* label);
46464674
CIMGUI_API void igImQsort(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*));
46474675
CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b);
46484676
CIMGUI_API bool igImIsPowerOfTwo_Int(int v);
@@ -4691,6 +4719,9 @@ CIMGUI_API int igImTextCountUtf8BytesFromChar(const char* in_text,const char* in
46914719
CIMGUI_API int igImTextCountUtf8BytesFromStr(const ImWchar* in_text,const ImWchar* in_text_end);
46924720
CIMGUI_API const char* igImTextFindPreviousUtf8Codepoint(const char* in_text_start,const char* in_text_curr);
46934721
CIMGUI_API int igImTextCountLines(const char* in_text,const char* in_text_end);
4722+
CIMGUI_API void igImFontCalcTextSizeEx(ImVec2 *pOut,ImFont* font,float size,float max_width,float wrap_width,const char* text_begin,const char* text_end_display,const char* text_end,const char** out_remaining,ImVec2* out_offset,ImDrawTextFlags flags);
4723+
CIMGUI_API const char* igImFontCalcWordWrapPositionEx(ImFont* font,float size,const char* text,const char* text_end,float wrap_width,ImDrawTextFlags flags);
4724+
CIMGUI_API const char* igImTextCalcWordWrapNextLineStart(const char* text,const char* text_end,ImDrawTextFlags flags);
46944725
CIMGUI_API ImFileHandle igImFileOpen(const char* filename,const char* mode);
46954726
CIMGUI_API bool igImFileClose(ImFileHandle file);
46964727
CIMGUI_API ImU64 igImFileGetSize(ImFileHandle file);
@@ -4782,6 +4813,7 @@ CIMGUI_API void ImRect_ClipWithFull(ImRect* self,const ImRect r);
47824813
CIMGUI_API void ImRect_Floor(ImRect* self);
47834814
CIMGUI_API bool ImRect_IsInverted(ImRect* self);
47844815
CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self);
4816+
CIMGUI_API const ImVec4* ImRect_AsVec4(ImRect* self);
47854817
CIMGUI_API size_t igImBitArrayGetStorageSizeInBytes(int bitcount);
47864818
CIMGUI_API void igImBitArrayClearAllBits(ImU32* arr,int bitcount);
47874819
CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
@@ -4825,6 +4857,7 @@ CIMGUI_API void ImGuiInputTextState_ClearText(ImGuiInputTextState* self);
48254857
CIMGUI_API void ImGuiInputTextState_ClearFreeMemory(ImGuiInputTextState* self);
48264858
CIMGUI_API void ImGuiInputTextState_OnKeyPressed(ImGuiInputTextState* self,int key);
48274859
CIMGUI_API void ImGuiInputTextState_OnCharPressed(ImGuiInputTextState* self,unsigned int c);
4860+
CIMGUI_API float ImGuiInputTextState_GetPreferredOffsetX(ImGuiInputTextState* self);
48284861
CIMGUI_API void ImGuiInputTextState_CursorAnimReset(ImGuiInputTextState* self);
48294862
CIMGUI_API void ImGuiInputTextState_CursorClamp(ImGuiInputTextState* self);
48304863
CIMGUI_API bool ImGuiInputTextState_HasSelection(ImGuiInputTextState* self);
@@ -5061,6 +5094,7 @@ CIMGUI_API void igCalcItemSize(ImVec2 *pOut,ImVec2 size,float default_w,float de
50615094
CIMGUI_API float igCalcWrapWidthForPos(const ImVec2 pos,float wrap_pos_x);
50625095
CIMGUI_API void igPushMultiItemsWidths(int components,float width_full);
50635096
CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess,float width_min);
5097+
CIMGUI_API void igCalcClipRectVisibleItemsY(const ImRect clip_rect,const ImVec2 pos,float items_height,int* out_visible_start,int* out_visible_end);
50645098
CIMGUI_API const ImGuiStyleVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx);
50655099
CIMGUI_API void igBeginDisabledOverrideReenable(void);
50665100
CIMGUI_API void igEndDisabledOverrideReenable(void);
@@ -5274,6 +5308,8 @@ CIMGUI_API void igTableSettingsAddSettingsHandler(void);
52745308
CIMGUI_API ImGuiTableSettings* igTableSettingsCreate(ImGuiID id,int columns_count);
52755309
CIMGUI_API ImGuiTableSettings* igTableSettingsFindByID(ImGuiID id);
52765310
CIMGUI_API ImGuiTabBar* igGetCurrentTabBar(void);
5311+
CIMGUI_API ImGuiTabBar* igTabBarFindByID(ImGuiID id);
5312+
CIMGUI_API void igTabBarRemove(ImGuiTabBar* tab_bar);
52775313
CIMGUI_API bool igBeginTabBarEx(ImGuiTabBar* tab_bar,const ImRect bb,ImGuiTabBarFlags flags);
52785314
CIMGUI_API ImGuiTabItem* igTabBarFindTabByID(ImGuiTabBar* tab_bar,ImGuiID tab_id);
52795315
CIMGUI_API ImGuiTabItem* igTabBarFindTabByOrder(ImGuiTabBar* tab_bar,int order);
@@ -5419,7 +5455,7 @@ CIMGUI_API ImFontLoader* ImFontLoader_ImFontLoader(void);
54195455
CIMGUI_API void ImFontLoader_destroy(ImFontLoader* self);
54205456
CIMGUI_API const ImFontLoader* igImFontAtlasGetFontLoaderForStbTruetype(void);
54215457
CIMGUI_API int igImFontAtlasRectId_GetIndex(ImFontAtlasRectId id);
5422-
CIMGUI_API int igImFontAtlasRectId_GetGeneration(ImFontAtlasRectId id);
5458+
CIMGUI_API unsigned int igImFontAtlasRectId_GetGeneration(ImFontAtlasRectId id);
54235459
CIMGUI_API ImFontAtlasRectId igImFontAtlasRectId_Make(int index_idx,int gen_idx);
54245460
CIMGUI_API ImFontAtlasBuilder* ImFontAtlasBuilder_ImFontAtlasBuilder(void);
54255461
CIMGUI_API void ImFontAtlasBuilder_destroy(ImFontAtlasBuilder* self);

0 commit comments

Comments
 (0)