pull imgui docking 1.90.8 and generate

avoid type&name -> type& name
add definitions to cimgui.h (issue #268 )
2025-08-11 12:18:30 +01:00 · 2024-06-07 13:21:00 +02:00 · 2024-06-07 13:18:13 +02:00 · 2024-06-01 12:54:07 +02:00 · 2024-05-28 10:12:28 +02:00
13 changed files with 5057 additions and 4673 deletions
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.90.6 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.90.8 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.90.6" 19060 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.90.8" 19080 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 #ifdef IMGUI_ENABLE_FREETYPE
@@ -1260,13 +1260,13 @@ CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
 {
    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
 }
-CIMGUI_API ImGuiID igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
+CIMGUI_API ImGuiID igDockSpace(ImGuiID dockspace_id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
 {
-    return ImGui::DockSpace(id,size,flags,window_class);
+    return ImGui::DockSpace(dockspace_id,size,flags,window_class);
 }
-CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
+CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiID dockspace_id,const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class)
 {
-    return ImGui::DockSpaceOverViewport(viewport,flags,window_class);
+    return ImGui::DockSpaceOverViewport(dockspace_id,viewport,flags,window_class);
 }
 CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond)
 {
@@ -1532,6 +1532,14 @@ CIMGUI_API void igSetNextFrameWantCaptureKeyboard(bool want_capture_keyboard)
 {
    return ImGui::SetNextFrameWantCaptureKeyboard(want_capture_keyboard);
 }
+CIMGUI_API bool igShortcut_Nil(ImGuiKeyChord key_chord,ImGuiInputFlags flags)
+{
+    return ImGui::Shortcut(key_chord,flags);
+}
+CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags flags)
+{
+    return ImGui::SetNextItemShortcut(key_chord,flags);
+}
 CIMGUI_API bool igIsMouseDown_Nil(ImGuiMouseButton button)
 {
    return ImGui::IsMouseDown(button);
@@ -2947,7 +2955,7 @@ CIMGUI_API void igImMax(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs)
 {
    *pOut = ImMax(lhs,rhs);
 }
-CIMGUI_API void igImClamp(ImVec2 *pOut,const ImVec2 v,const ImVec2 mn,ImVec2 mx)
+CIMGUI_API void igImClamp(ImVec2 *pOut,const ImVec2 v,const ImVec2 mn,const ImVec2 mx)
 {
    *pOut = ImClamp(v,mn,mx);
 }
@@ -3295,6 +3303,10 @@ CIMGUI_API void ImDrawDataBuilder_destroy(ImDrawDataBuilder* self)
 {
    IM_DELETE(self);
 }
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent)
+{
+    return self->GetVarPtr(parent);
+}
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Int(ImGuiStyleVar idx,int v)
 {
    return IM_NEW(ImGuiStyleMod)(idx,v);
@@ -3483,10 +3495,6 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index)
 {
    return IM_NEW(ImGuiPtrOrIndex)(index);
 }
-CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent)
-{
-    return self->GetVarPtr(parent);
-}
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
 {
    return IM_NEW(ImGuiPopupData)();
@@ -3783,18 +3791,10 @@ CIMGUI_API float ImGuiWindow_CalcFontSize(ImGuiWindow* self)
 {
    return self->CalcFontSize();
 }
-CIMGUI_API float ImGuiWindow_TitleBarHeight(ImGuiWindow* self)
-{
-    return self->TitleBarHeight();
-}
 CIMGUI_API void ImGuiWindow_TitleBarRect(ImRect *pOut,ImGuiWindow* self)
 {
    *pOut = self->TitleBarRect();
 }
-CIMGUI_API float ImGuiWindow_MenuBarHeight(ImGuiWindow* self)
-{
-    return self->MenuBarHeight();
-}
 CIMGUI_API void ImGuiWindow_MenuBarRect(ImRect *pOut,ImGuiWindow* self)
 {
    *pOut = self->MenuBarRect();
@@ -4015,6 +4015,10 @@ CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags()
 {
    return ImGui::UpdateHoveredWindowAndCaptureFlags();
 }
+CIMGUI_API void igFindHoveredWindowEx(const ImVec2 pos,bool find_first_and_in_any_viewport,ImGuiWindow** out_hovered_window,ImGuiWindow** out_hovered_window_under_moving_window)
+{
+    return ImGui::FindHoveredWindowEx(pos,find_first_and_in_any_viewport,out_hovered_window,out_hovered_window_under_moving_window);
+}
 CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window)
 {
    return ImGui::StartMouseMovingWindow(window);
@@ -4271,6 +4275,14 @@ CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx)
 {
    return ImGui::GetStyleVarInfo(idx);
 }
+CIMGUI_API void igBeginDisabledOverrideReenable()
+{
+    return ImGui::BeginDisabledOverrideReenable();
+}
+CIMGUI_API void igEndDisabledOverrideReenable()
+{
+    return ImGui::EndDisabledOverrideReenable();
+}
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth)
 {
    return ImGui::LogBegin(type,auto_open_depth);
@@ -4451,9 +4463,9 @@ CIMGUI_API bool igIsNamedKey(ImGuiKey key)
 {
    return ImGui::IsNamedKey(key);
 }
-CIMGUI_API bool igIsNamedKeyOrModKey(ImGuiKey key)
+CIMGUI_API bool igIsNamedKeyOrMod(ImGuiKey key)
 {
-    return ImGui::IsNamedKeyOrModKey(key);
+    return ImGui::IsNamedKeyOrMod(key);
 }
 CIMGUI_API bool igIsLegacyKey(ImGuiKey key)
 {
@@ -4479,13 +4491,13 @@ CIMGUI_API bool igIsModKey(ImGuiKey key)
 {
    return ImGui::IsModKey(key);
 }
-CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,ImGuiKeyChord key_chord)
+CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiKeyChord key_chord)
 {
-    return ImGui::FixupKeyChord(ctx,key_chord);
+    return ImGui::FixupKeyChord(key_chord);
 }
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
+CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key)
 {
-    return ImGui::ConvertSingleModFlagToKey(ctx,key);
+    return ImGui::ConvertSingleModFlagToKey(key);
 }
 CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key)
 {
@@ -4563,21 +4575,25 @@ CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id)
 {
    return ImGui::IsKeyDown(key,owner_id);
 }
-CIMGUI_API bool igIsKeyPressed_ID(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags)
+CIMGUI_API bool igIsKeyPressed_InputFlags(ImGuiKey key,ImGuiInputFlags flags,ImGuiID owner_id)
 {
-    return ImGui::IsKeyPressed(key,owner_id,flags);
+    return ImGui::IsKeyPressed(key,flags,owner_id);
 }
 CIMGUI_API bool igIsKeyReleased_ID(ImGuiKey key,ImGuiID owner_id)
 {
    return ImGui::IsKeyReleased(key,owner_id);
 }
+CIMGUI_API bool igIsKeyChordPressed_InputFlags(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
+{
+    return ImGui::IsKeyChordPressed(key_chord,flags,owner_id);
+}
 CIMGUI_API bool igIsMouseDown_ID(ImGuiMouseButton button,ImGuiID owner_id)
 {
    return ImGui::IsMouseDown(button,owner_id);
 }
-CIMGUI_API bool igIsMouseClicked_ID(ImGuiMouseButton button,ImGuiID owner_id,ImGuiInputFlags flags)
+CIMGUI_API bool igIsMouseClicked_InputFlags(ImGuiMouseButton button,ImGuiInputFlags flags,ImGuiID owner_id)
 {
-    return ImGui::IsMouseClicked(button,owner_id,flags);
+    return ImGui::IsMouseClicked(button,flags,owner_id);
 }
 CIMGUI_API bool igIsMouseReleased_ID(ImGuiMouseButton button,ImGuiID owner_id)
 {
@@ -4587,21 +4603,13 @@ CIMGUI_API bool igIsMouseDoubleClicked_ID(ImGuiMouseButton button,ImGuiID owner_
 {
    return ImGui::IsMouseDoubleClicked(button,owner_id);
 }
-CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
+CIMGUI_API bool igShortcut_ID(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
 {
-    return ImGui::IsKeyChordPressed(key_chord,owner_id,flags);
+    return ImGui::Shortcut(key_chord,flags,owner_id);
 }
-CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord)
+CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
 {
-    return ImGui::SetNextItemShortcut(key_chord);
-}
-CIMGUI_API bool igShortcut(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
-{
-    return ImGui::Shortcut(key_chord,owner_id,flags);
-}
-CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
-{
-    return ImGui::SetShortcutRouting(key_chord,owner_id,flags);
+    return ImGui::SetShortcutRouting(key_chord,flags,owner_id);
 }
 CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id)
 {
@@ -5339,9 +5347,9 @@ CIMGUI_API void igDataTypeApplyOp(ImGuiDataType data_type,int op,void* output,co
 {
    return ImGui::DataTypeApplyOp(data_type,op,output,arg_1,arg_2);
 }
-CIMGUI_API bool igDataTypeApplyFromText(const char* buf,ImGuiDataType data_type,void* p_data,const char* format)
+CIMGUI_API bool igDataTypeApplyFromText(const char* buf,ImGuiDataType data_type,void* p_data,const char* format,void* p_data_when_empty)
 {
-    return ImGui::DataTypeApplyFromText(buf,data_type,p_data,format);
+    return ImGui::DataTypeApplyFromText(buf,data_type,p_data,format,p_data_when_empty);
 }
 CIMGUI_API int igDataTypeCompare(ImGuiDataType data_type,const void* arg_1,const void* arg_2)
 {
@@ -5375,6 +5383,10 @@ CIMGUI_API ImGuiInputTextState* igGetInputTextState(ImGuiID id)
 {
    return ImGui::GetInputTextState(id);
 }
+CIMGUI_API void igSetNextItemRefVal(ImGuiDataType data_type,void* p_data)
+{
+    return ImGui::SetNextItemRefVal(data_type,p_data);
+}
 CIMGUI_API void igColorTooltip(const char* text,const float* col,ImGuiColorEditFlags flags)
 {
    return ImGui::ColorTooltip(text,col,flags);
@@ -5454,6 +5466,10 @@ CIMGUI_API void igDebugDrawItemRect(ImU32 col)
 {
    return ImGui::DebugDrawItemRect(col);
 }
+CIMGUI_API void igDebugTextUnformattedWithLocateItem(const char* line_begin,const char* line_end)
+{
+    return ImGui::DebugTextUnformattedWithLocateItem(line_begin,line_end);
+}
 CIMGUI_API void igDebugLocateItem(ImGuiID target_id)
 {
    return ImGui::DebugLocateItem(target_id);
--- a/cimgui.h
+++ b/cimgui.h
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.90.6" 19060 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.90.8" 19080 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 #ifndef CIMGUI_INCLUDED
@@ -119,6 +119,15 @@ typedef struct ImGuiWindowTempData ImGuiWindowTempData;
 typedef struct ImGuiWindowSettings ImGuiWindowSettings;
 typedef struct ImVector_const_charPtr {int Size;int Capacity;const char** Data;} ImVector_const_charPtr;

+typedef unsigned int ImGuiID;
+typedef signed char ImS8;
+typedef unsigned char ImU8;
+typedef signed short ImS16;
+typedef unsigned short ImU16;
+typedef signed int ImS32;
+typedef unsigned int ImU32;
+typedef signed long long ImS64;
+typedef unsigned long long ImU64;
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
@@ -155,10 +164,8 @@ struct ImGuiWindowClass;
 typedef int ImGuiCol;
 typedef int ImGuiCond;
 typedef int ImGuiDataType;
-typedef int ImGuiDir;
 typedef int ImGuiMouseButton;
 typedef int ImGuiMouseCursor;
-typedef int ImGuiSortDirection;
 typedef int ImGuiStyleVar;
 typedef int ImGuiTableBgTarget;
 typedef int ImDrawFlags;
@@ -174,6 +181,7 @@ typedef int ImGuiDockNodeFlags;
 typedef int ImGuiDragDropFlags;
 typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
+typedef int ImGuiInputFlags;
 typedef int ImGuiInputTextFlags;
 typedef int ImGuiKeyChord;
 typedef int ImGuiPopupFlags;
@@ -189,15 +197,6 @@ typedef int ImGuiViewportFlags;
 typedef int ImGuiWindowFlags;
 typedef void* ImTextureID;
 typedef unsigned short ImDrawIdx;
-typedef unsigned int ImGuiID;
-typedef signed char ImS8;
-typedef unsigned char ImU8;
-typedef signed short ImS16;
-typedef unsigned short ImU16;
-typedef signed int ImS32;
-typedef unsigned int ImU32;
-typedef signed long long ImS64;
-typedef unsigned long long ImU64;
 typedef unsigned int ImWchar32;
 typedef unsigned short ImWchar16;
 typedef ImWchar16 ImWchar;
@@ -263,25 +262,27 @@ typedef enum {
    ImGuiInputTextFlags_None = 0,
    ImGuiInputTextFlags_CharsDecimal = 1 << 0,
    ImGuiInputTextFlags_CharsHexadecimal = 1 << 1,
-    ImGuiInputTextFlags_CharsUppercase = 1 << 2,
-    ImGuiInputTextFlags_CharsNoBlank = 1 << 3,
-    ImGuiInputTextFlags_AutoSelectAll = 1 << 4,
-    ImGuiInputTextFlags_EnterReturnsTrue = 1 << 5,
-    ImGuiInputTextFlags_CallbackCompletion = 1 << 6,
-    ImGuiInputTextFlags_CallbackHistory = 1 << 7,
-    ImGuiInputTextFlags_CallbackAlways = 1 << 8,
-    ImGuiInputTextFlags_CallbackCharFilter = 1 << 9,
-    ImGuiInputTextFlags_AllowTabInput = 1 << 10,
-    ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11,
-    ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12,
-    ImGuiInputTextFlags_AlwaysOverwrite = 1 << 13,
-    ImGuiInputTextFlags_ReadOnly = 1 << 14,
-    ImGuiInputTextFlags_Password = 1 << 15,
+    ImGuiInputTextFlags_CharsScientific = 1 << 2,
+    ImGuiInputTextFlags_CharsUppercase = 1 << 3,
+    ImGuiInputTextFlags_CharsNoBlank = 1 << 4,
+    ImGuiInputTextFlags_AllowTabInput = 1 << 5,
+    ImGuiInputTextFlags_EnterReturnsTrue = 1 << 6,
+    ImGuiInputTextFlags_EscapeClearsAll = 1 << 7,
+    ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 8,
+    ImGuiInputTextFlags_ReadOnly = 1 << 9,
+    ImGuiInputTextFlags_Password = 1 << 10,
+    ImGuiInputTextFlags_AlwaysOverwrite = 1 << 11,
+    ImGuiInputTextFlags_AutoSelectAll = 1 << 12,
+    ImGuiInputTextFlags_ParseEmptyRefVal = 1 << 13,
+    ImGuiInputTextFlags_DisplayEmptyRefVal = 1 << 14,
+    ImGuiInputTextFlags_NoHorizontalScroll = 1 << 15,
    ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
-    ImGuiInputTextFlags_CharsScientific = 1 << 17,
-    ImGuiInputTextFlags_CallbackResize = 1 << 18,
-    ImGuiInputTextFlags_CallbackEdit = 1 << 19,
-    ImGuiInputTextFlags_EscapeClearsAll = 1 << 20,
+    ImGuiInputTextFlags_CallbackCompletion = 1 << 17,
+    ImGuiInputTextFlags_CallbackHistory = 1 << 18,
+    ImGuiInputTextFlags_CallbackAlways = 1 << 19,
+    ImGuiInputTextFlags_CallbackCharFilter = 1 << 20,
+    ImGuiInputTextFlags_CallbackResize = 1 << 21,
+    ImGuiInputTextFlags_CallbackEdit = 1 << 22,
 }ImGuiInputTextFlags_;
 typedef enum {
    ImGuiTreeNodeFlags_None = 0,
@@ -431,18 +432,18 @@ typedef enum {
    ImGuiDataType_COUNT
 }ImGuiDataType_;
 typedef enum {
-    ImGuiDir_None = -1,
-    ImGuiDir_Left = 0,
-    ImGuiDir_Right = 1,
-    ImGuiDir_Up = 2,
-    ImGuiDir_Down = 3,
-    ImGuiDir_COUNT
-}ImGuiDir_;
+ImGuiDir_None=-1,
+ImGuiDir_Left=0,
+ImGuiDir_Right=1,
+ImGuiDir_Up=2,
+ImGuiDir_Down=3,
+ImGuiDir_COUNT=4,
+}ImGuiDir;
 typedef enum {
-    ImGuiSortDirection_None = 0,
-    ImGuiSortDirection_Ascending = 1,
-    ImGuiSortDirection_Descending = 2
-}ImGuiSortDirection_;
+ImGuiSortDirection_None=0,
+ImGuiSortDirection_Ascending=1,
+ImGuiSortDirection_Descending=2,
+}ImGuiSortDirection;
 typedef enum {
 ImGuiKey_None=0,
 ImGuiKey_Tab=512,
@@ -605,14 +606,26 @@ ImGuiMod_Ctrl=1 << 12,
 ImGuiMod_Shift=1 << 13,
 ImGuiMod_Alt=1 << 14,
 ImGuiMod_Super=1 << 15,
-ImGuiMod_Shortcut=1 << 11,
-ImGuiMod_Mask_=0xF800,
+ImGuiMod_Mask_=0xF000,
 ImGuiKey_NamedKey_BEGIN=512,
 ImGuiKey_NamedKey_END=ImGuiKey_COUNT,
 ImGuiKey_NamedKey_COUNT=ImGuiKey_NamedKey_END - ImGuiKey_NamedKey_BEGIN,
 ImGuiKey_KeysData_SIZE=ImGuiKey_NamedKey_COUNT,
 ImGuiKey_KeysData_OFFSET=ImGuiKey_NamedKey_BEGIN,
 }ImGuiKey;
+typedef enum {
+    ImGuiInputFlags_None = 0,
+    ImGuiInputFlags_Repeat = 1 << 0,
+    ImGuiInputFlags_RouteActive = 1 << 10,
+    ImGuiInputFlags_RouteFocused = 1 << 11,
+    ImGuiInputFlags_RouteGlobal = 1 << 12,
+    ImGuiInputFlags_RouteAlways = 1 << 13,
+    ImGuiInputFlags_RouteOverFocused = 1 << 14,
+    ImGuiInputFlags_RouteOverActive = 1 << 15,
+    ImGuiInputFlags_RouteUnlessBgFocused = 1 << 16,
+    ImGuiInputFlags_RouteFromRootWindow = 1 << 17,
+    ImGuiInputFlags_Tooltip = 1 << 18,
+}ImGuiInputFlags_;
 typedef enum {
    ImGuiConfigFlags_None = 0,
    ImGuiConfigFlags_NavEnableKeyboard = 1 << 0,
@@ -738,7 +751,6 @@ typedef enum {
    ImGuiButtonFlags_MouseButtonRight = 1 << 1,
    ImGuiButtonFlags_MouseButtonMiddle = 1 << 2,
    ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
-    ImGuiButtonFlags_MouseButtonDefault_ = ImGuiButtonFlags_MouseButtonLeft,
 }ImGuiButtonFlags_;
 typedef enum {
    ImGuiColorEditFlags_None = 0,
@@ -901,7 +913,7 @@ struct ImGuiTableColumnSortSpecs
    ImGuiID ColumnUserID;
    ImS16 ColumnIndex;
    ImS16 SortOrder;
-    ImGuiSortDirection SortDirection : 8;
+    ImGuiSortDirection SortDirection;
 };
 struct ImGuiStyle
 {
@@ -1058,6 +1070,7 @@ struct ImGuiIO
    bool MouseDownOwned[5];
    bool MouseDownOwnedUnlessPopupClose[5];
    bool MouseWheelRequestAxisSwap;
+    bool MouseCtrlLeftAsRightClick;
    float MouseDownDuration[5];
    float MouseDownDurationPrev[5];
    ImVec2 MouseDragMaxDistanceAbs[5];
@@ -1517,7 +1530,6 @@ typedef int ImGuiLayoutType;
 typedef int ImGuiActivateFlags;
 typedef int ImGuiDebugLogFlags;
 typedef int ImGuiFocusRequestFlags;
-typedef int ImGuiInputFlags;
 typedef int ImGuiItemFlags;
 typedef int ImGuiItemStatusFlags;
 typedef int ImGuiOldColumnFlags;
@@ -1623,6 +1635,29 @@ struct ImDrawDataBuilder
    ImVector_ImDrawListPtr* Layers[2];
    ImVector_ImDrawListPtr LayerData1;
 };
+struct ImGuiDataVarInfo
+{
+    ImGuiDataType Type;
+    ImU32 Count;
+    ImU32 Offset;
+};
+typedef struct ImGuiDataTypeStorage ImGuiDataTypeStorage;
+struct ImGuiDataTypeStorage
+{
+    ImU8 Data[8];
+};
+struct ImGuiDataTypeInfo
+{
+    size_t Size;
+    const char* Name;
+    const char* PrintFmt;
+    const char* ScanFmt;
+};
+typedef enum {
+    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
+    ImGuiDataType_Pointer,
+    ImGuiDataType_ID,
+}ImGuiDataTypePrivate_;
 typedef enum {
    ImGuiItemFlags_None = 0,
    ImGuiItemFlags_NoTabStop = 1 << 0,
@@ -1650,6 +1685,7 @@ typedef enum {
    ImGuiItemStatusFlags_HoveredWindow = 1 << 7,
    ImGuiItemStatusFlags_Visible = 1 << 8,
    ImGuiItemStatusFlags_HasClipRect = 1 << 9,
+    ImGuiItemStatusFlags_HasShortcut = 1 << 10,
 }ImGuiItemStatusFlags_;
 typedef enum {
    ImGuiHoveredFlags_DelayMask_ = ImGuiHoveredFlags_DelayNone | ImGuiHoveredFlags_DelayShort | ImGuiHoveredFlags_DelayNormal | ImGuiHoveredFlags_NoSharedDelay,
@@ -1870,6 +1906,7 @@ typedef enum {
    ImGuiNextItemDataFlags_HasWidth = 1 << 0,
    ImGuiNextItemDataFlags_HasOpen = 1 << 1,
    ImGuiNextItemDataFlags_HasShortcut = 1 << 2,
+    ImGuiNextItemDataFlags_HasRefVal = 1 << 3,
 }ImGuiNextItemDataFlags_;
 struct ImGuiNextItemData
 {
@@ -1878,8 +1915,10 @@ struct ImGuiNextItemData
    ImGuiSelectionUserData SelectionUserData;
    float Width;
    ImGuiKeyChord Shortcut;
+    ImGuiInputFlags ShortcutFlags;
    bool OpenVal;
-    ImGuiCond OpenCond : 8;
+    ImU8 OpenCond;
+    ImGuiDataTypeStorage RefVal;
 };
 struct ImGuiLastItemData
 {
@@ -1890,6 +1929,7 @@ struct ImGuiLastItemData
    ImRect NavRect;
    ImRect DisplayRect;
    ImRect ClipRect;
+    ImGuiKeyChord Shortcut;
 };
 struct ImGuiNavTreeNodeData
 {
@@ -1915,6 +1955,7 @@ struct ImGuiWindowStackData
    ImGuiWindow* Window;
    ImGuiLastItemData ParentLastItemDataBackup;
    ImGuiStackSizes StackSizesOnBegin;
+    bool DisabledOverrideReenable;
 };
 typedef struct ImGuiShrinkWidthItem ImGuiShrinkWidthItem;
 struct ImGuiShrinkWidthItem
@@ -1929,29 +1970,6 @@ struct ImGuiPtrOrIndex
    void* Ptr;
    int Index;
 };
-struct ImGuiDataVarInfo
-{
-    ImGuiDataType Type;
-    ImU32 Count;
-    ImU32 Offset;
-};
-typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
-struct ImGuiDataTypeTempStorage
-{
-    ImU8 Data[8];
-};
-struct ImGuiDataTypeInfo
-{
-    size_t Size;
-    const char* Name;
-    const char* PrintFmt;
-    const char* ScanFmt;
-};
-typedef enum {
-    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
-    ImGuiDataType_Pointer,
-    ImGuiDataType_ID,
-}ImGuiDataTypePrivate_;
 typedef enum {
    ImGuiPopupPositionPolicy_Default,
    ImGuiPopupPositionPolicy_ComboBox,
@@ -2064,8 +2082,6 @@ struct ImGuiKeyOwnerData
    bool LockUntilRelease;
 };
 typedef enum {
-    ImGuiInputFlags_None = 0,
-    ImGuiInputFlags_Repeat = 1 << 0,
    ImGuiInputFlags_RepeatRateDefault = 1 << 1,
    ImGuiInputFlags_RepeatRateNavMove = 1 << 2,
    ImGuiInputFlags_RepeatRateNavTweak = 1 << 3,
@@ -2073,28 +2089,24 @@ typedef enum {
    ImGuiInputFlags_RepeatUntilKeyModsChange = 1 << 5,
    ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone = 1 << 6,
    ImGuiInputFlags_RepeatUntilOtherKeyPress = 1 << 7,
-    ImGuiInputFlags_CondHovered = 1 << 8,
-    ImGuiInputFlags_CondActive = 1 << 9,
+    ImGuiInputFlags_LockThisFrame = 1 << 20,
+    ImGuiInputFlags_LockUntilRelease = 1 << 21,
+    ImGuiInputFlags_CondHovered = 1 << 22,
+    ImGuiInputFlags_CondActive = 1 << 23,
    ImGuiInputFlags_CondDefault_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive,
-    ImGuiInputFlags_LockThisFrame = 1 << 10,
-    ImGuiInputFlags_LockUntilRelease = 1 << 11,
-    ImGuiInputFlags_RouteFocused = 1 << 12,
-    ImGuiInputFlags_RouteGlobalLow = 1 << 13,
-    ImGuiInputFlags_RouteGlobal = 1 << 14,
-    ImGuiInputFlags_RouteGlobalHigh = 1 << 15,
-    ImGuiInputFlags_RouteAlways = 1 << 16,
-    ImGuiInputFlags_RouteUnlessBgFocused= 1 << 17,
    ImGuiInputFlags_RepeatRateMask_ = ImGuiInputFlags_RepeatRateDefault | ImGuiInputFlags_RepeatRateNavMove | ImGuiInputFlags_RepeatRateNavTweak,
    ImGuiInputFlags_RepeatUntilMask_ = ImGuiInputFlags_RepeatUntilRelease | ImGuiInputFlags_RepeatUntilKeyModsChange | ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone | ImGuiInputFlags_RepeatUntilOtherKeyPress,
    ImGuiInputFlags_RepeatMask_ = ImGuiInputFlags_Repeat | ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_,
    ImGuiInputFlags_CondMask_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive,
-    ImGuiInputFlags_RouteMask_ = ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh,
+    ImGuiInputFlags_RouteTypeMask_ = ImGuiInputFlags_RouteActive | ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteAlways,
+    ImGuiInputFlags_RouteOptionsMask_ = ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive | ImGuiInputFlags_RouteUnlessBgFocused | ImGuiInputFlags_RouteFromRootWindow,
    ImGuiInputFlags_SupportedByIsKeyPressed = ImGuiInputFlags_RepeatMask_,
    ImGuiInputFlags_SupportedByIsMouseClicked = ImGuiInputFlags_Repeat,
-    ImGuiInputFlags_SupportedByShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused,
+    ImGuiInputFlags_SupportedByShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_,
+    ImGuiInputFlags_SupportedBySetNextItemShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_ | ImGuiInputFlags_Tooltip,
    ImGuiInputFlags_SupportedBySetKeyOwner = ImGuiInputFlags_LockThisFrame | ImGuiInputFlags_LockUntilRelease,
    ImGuiInputFlags_SupportedBySetItemKeyOwner = ImGuiInputFlags_SupportedBySetKeyOwner | ImGuiInputFlags_CondMask_,
-}ImGuiInputFlags_;
+}ImGuiInputFlagsPrivate_;
 typedef struct ImGuiListClipperRange ImGuiListClipperRange;
 struct ImGuiListClipperRange
 {
@@ -2555,6 +2567,7 @@ struct ImGuiContext
    ImFont* Font;
    float FontSize;
    float FontBaseSize;
+    float CurrentDpiScale;
    ImDrawListSharedData DrawListSharedData;
    double Time;
    int FrameCount;
@@ -2593,10 +2606,11 @@ struct ImGuiContext
    ImGuiID DebugHookIdInfo;
    ImGuiID HoveredId;
    ImGuiID HoveredIdPreviousFrame;
-    bool HoveredIdAllowOverlap;
-    bool HoveredIdDisabled;
    float HoveredIdTimer;
    float HoveredIdNotActiveTimer;
+    bool HoveredIdAllowOverlap;
+    bool HoveredIdDisabled;
+    bool ItemUnclipByLog;
    ImGuiID ActiveId;
    ImGuiID ActiveIdIsAlive;
    float ActiveIdTimer;
@@ -2644,7 +2658,6 @@ struct ImGuiContext
    ImVector_ImGuiPopupData BeginPopupStack;
    ImVector_ImGuiNavTreeNodeData NavTreeNodeStack;
    ImVector_ImGuiViewportPPtr Viewports;
-    float CurrentDpiScale;
    ImGuiViewportP* CurrentViewport;
    ImGuiViewportP* MouseViewport;
    ImGuiViewportP* MouseLastHoveredViewport;
@@ -2657,11 +2670,11 @@ struct ImGuiContext
    ImGuiWindow* NavWindow;
    ImGuiID NavId;
    ImGuiID NavFocusScopeId;
-    ImVector_ImGuiFocusScopeData NavFocusRoute;
    ImGuiID NavActivateId;
    ImGuiID NavActivateDownId;
    ImGuiID NavActivatePressedId;
    ImGuiActivateFlags NavActivateFlags;
+    ImVector_ImGuiFocusScopeData NavFocusRoute;
    ImGuiID NavHighlightActivatedId;
    float NavHighlightActivatedTimer;
    ImGuiID NavJustMovedToId;
@@ -2754,6 +2767,7 @@ struct ImGuiContext
    ImGuiInputTextDeactivatedState InputTextDeactivatedState;
    ImFont InputTextPasswordFont;
    ImGuiID TempInputId;
+    ImGuiDataTypeStorage DataTypeZeroValue;
    int BeginMenuDepth;
    int BeginComboDepth;
    ImGuiColorEditFlags ColorEditOptions;
@@ -2766,13 +2780,14 @@ struct ImGuiContext
    ImGuiComboPreviewData ComboPreviewData;
    ImRect WindowResizeBorderExpectedRect;
    bool WindowResizeRelativeMode;
+    short ScrollbarSeekMode;
+    float ScrollbarClickDeltaToGrabCenter;
    float SliderGrabClickOffset;
    float SliderCurrentAccum;
    bool SliderCurrentAccumDirty;
    bool DragCurrentAccumDirty;
    float DragCurrentAccum;
    float DragSpeedDefaultRatio;
-    float ScrollbarClickDeltaToGrabCenter;
    float DisabledAlphaBackup;
    short DisabledStackSize;
    short LockMarkEdited;
@@ -2896,6 +2911,7 @@ struct ImGuiWindow
    ImVec2 WindowPadding;
    float WindowRounding;
    float WindowBorderSize;
+    float TitleBarHeight, MenuBarHeight;
    float DecoOuterSizeX1, DecoOuterSizeY1;
    float DecoOuterSizeX2, DecoOuterSizeY2;
    float DecoInnerSizeX1, DecoInnerSizeY1;
@@ -2903,6 +2919,7 @@ struct ImGuiWindow
    ImGuiID MoveId;
    ImGuiID TabId;
    ImGuiID ChildId;
+    ImGuiID PopupId;
    ImVec2 Scroll;
    ImVec2 ScrollMax;
    ImVec2 ScrollTarget;
@@ -2930,7 +2947,6 @@ struct ImGuiWindow
    short BeginOrderWithinParent;
    short BeginOrderWithinContext;
    short FocusOrder;
-    ImGuiID PopupId;
    ImS8 AutoFitFramesX, AutoFitFramesY;
    bool AutoFitOnlyGrows;
    ImGuiDir AutoPosLastDirection;
@@ -3673,8 +3689,8 @@ CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags
 CIMGUI_API void igEndTabItem(void);
 CIMGUI_API bool igTabItemButton(const char* label,ImGuiTabItemFlags flags);
 CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
-CIMGUI_API ImGuiID igDockSpace(ImGuiID id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
-CIMGUI_API ImGuiID igDockSpaceOverViewport(const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
+CIMGUI_API ImGuiID igDockSpace(ImGuiID dockspace_id,const ImVec2 size,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
+CIMGUI_API ImGuiID igDockSpaceOverViewport(ImGuiID dockspace_id,const ImGuiViewport* viewport,ImGuiDockNodeFlags flags,const ImGuiWindowClass* window_class);
 CIMGUI_API void igSetNextWindowDockID(ImGuiID dock_id,ImGuiCond cond);
 CIMGUI_API void igSetNextWindowClass(const ImGuiWindowClass* window_class);
 CIMGUI_API ImGuiID igGetWindowDockID(void);
@@ -3741,6 +3757,8 @@ CIMGUI_API bool igIsKeyChordPressed_Nil(ImGuiKeyChord key_chord);
 CIMGUI_API int igGetKeyPressedAmount(ImGuiKey key,float repeat_delay,float rate);
 CIMGUI_API const char* igGetKeyName(ImGuiKey key);
 CIMGUI_API void igSetNextFrameWantCaptureKeyboard(bool want_capture_keyboard);
+CIMGUI_API bool igShortcut_Nil(ImGuiKeyChord key_chord,ImGuiInputFlags flags);
+CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags flags);
 CIMGUI_API bool igIsMouseDown_Nil(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseClicked_Bool(ImGuiMouseButton button,bool repeat);
 CIMGUI_API bool igIsMouseReleased_Nil(ImGuiMouseButton button);
@@ -4093,7 +4111,7 @@ CIMGUI_API float igImRsqrt_Float(float x);
 CIMGUI_API double igImRsqrt_double(double x);
 CIMGUI_API void igImMin(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs);
 CIMGUI_API void igImMax(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs);
-CIMGUI_API void igImClamp(ImVec2 *pOut,const ImVec2 v,const ImVec2 mn,ImVec2 mx);
+CIMGUI_API void igImClamp(ImVec2 *pOut,const ImVec2 v,const ImVec2 mn,const ImVec2 mx);
 CIMGUI_API void igImLerp_Vec2Float(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,float t);
 CIMGUI_API void igImLerp_Vec2Vec2(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 t);
 CIMGUI_API void igImLerp_Vec4(ImVec4 *pOut,const ImVec4 a,const ImVec4 b,float t);
@@ -4180,6 +4198,7 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
 CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error);
 CIMGUI_API ImDrawDataBuilder* ImDrawDataBuilder_ImDrawDataBuilder(void);
 CIMGUI_API void ImDrawDataBuilder_destroy(ImDrawDataBuilder* self);
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Int(ImGuiStyleVar idx,int v);
 CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Float(ImGuiStyleVar idx,float v);
@@ -4227,7 +4246,6 @@ CIMGUI_API void ImGuiStackSizes_CompareWithContextState(ImGuiStackSizes* self,Im
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr);
 CIMGUI_API void ImGuiPtrOrIndex_destroy(ImGuiPtrOrIndex* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index);
-CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent);
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void);
 CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self);
 CIMGUI_API ImGuiInputEvent* ImGuiInputEvent_ImGuiInputEvent(void);
@@ -4302,9 +4320,7 @@ CIMGUI_API ImGuiID ImGuiWindow_GetID_Int(ImGuiWindow* self,int n);
 CIMGUI_API ImGuiID ImGuiWindow_GetIDFromRectangle(ImGuiWindow* self,const ImRect r_abs);
 CIMGUI_API void ImGuiWindow_Rect(ImRect *pOut,ImGuiWindow* self);
 CIMGUI_API float ImGuiWindow_CalcFontSize(ImGuiWindow* self);
-CIMGUI_API float ImGuiWindow_TitleBarHeight(ImGuiWindow* self);
 CIMGUI_API void ImGuiWindow_TitleBarRect(ImRect *pOut,ImGuiWindow* self);
-CIMGUI_API float ImGuiWindow_MenuBarHeight(ImGuiWindow* self);
 CIMGUI_API void ImGuiWindow_MenuBarRect(ImRect *pOut,ImGuiWindow* self);
 CIMGUI_API ImGuiTabItem* ImGuiTabItem_ImGuiTabItem(void);
 CIMGUI_API void ImGuiTabItem_destroy(ImGuiTabItem* self);
@@ -4360,6 +4376,7 @@ CIMGUI_API void igInitialize(void);
 CIMGUI_API void igShutdown(void);
 CIMGUI_API void igUpdateInputEvents(bool trickle_fast_inputs);
 CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags(void);
+CIMGUI_API void igFindHoveredWindowEx(const ImVec2 pos,bool find_first_and_in_any_viewport,ImGuiWindow** out_hovered_window,ImGuiWindow** out_hovered_window_under_moving_window);
 CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
 CIMGUI_API void igStartMouseMovingWindowOrNode(ImGuiWindow* window,ImGuiDockNode* node,bool undock);
 CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
@@ -4424,6 +4441,8 @@ CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width
 CIMGUI_API void igPushItemFlag(ImGuiItemFlags option,bool enabled);
 CIMGUI_API void igPopItemFlag(void);
 CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx);
+CIMGUI_API void igBeginDisabledOverrideReenable(void);
+CIMGUI_API void igEndDisabledOverrideReenable(void);
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
 CIMGUI_API void igLogToBuffer(int auto_open_depth);
 CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
@@ -4469,15 +4488,15 @@ CIMGUI_API void igSetNavFocusScope(ImGuiID focus_scope_id);
 CIMGUI_API void igFocusItem(void);
 CIMGUI_API void igActivateItemByID(ImGuiID id);
 CIMGUI_API bool igIsNamedKey(ImGuiKey key);
-CIMGUI_API bool igIsNamedKeyOrModKey(ImGuiKey key);
+CIMGUI_API bool igIsNamedKeyOrMod(ImGuiKey key);
 CIMGUI_API bool igIsLegacyKey(ImGuiKey key);
 CIMGUI_API bool igIsKeyboardKey(ImGuiKey key);
 CIMGUI_API bool igIsGamepadKey(ImGuiKey key);
 CIMGUI_API bool igIsMouseKey(ImGuiKey key);
 CIMGUI_API bool igIsAliasKey(ImGuiKey key);
 CIMGUI_API bool igIsModKey(ImGuiKey key);
-CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,ImGuiKeyChord key_chord);
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key);
+CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiKeyChord key_chord);
+CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key);
 CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key);
 CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key);
 CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord);
@@ -4497,16 +4516,15 @@ CIMGUI_API void igSetItemKeyOwner(ImGuiKey key,ImGuiInputFlags flags);
 CIMGUI_API bool igTestKeyOwner(ImGuiKey key,ImGuiID owner_id);
 CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiContext* ctx,ImGuiKey key);
 CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id);
-CIMGUI_API bool igIsKeyPressed_ID(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags);
+CIMGUI_API bool igIsKeyPressed_InputFlags(ImGuiKey key,ImGuiInputFlags flags,ImGuiID owner_id);
 CIMGUI_API bool igIsKeyReleased_ID(ImGuiKey key,ImGuiID owner_id);
+CIMGUI_API bool igIsKeyChordPressed_InputFlags(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id);
 CIMGUI_API bool igIsMouseDown_ID(ImGuiMouseButton button,ImGuiID owner_id);
-CIMGUI_API bool igIsMouseClicked_ID(ImGuiMouseButton button,ImGuiID owner_id,ImGuiInputFlags flags);
+CIMGUI_API bool igIsMouseClicked_InputFlags(ImGuiMouseButton button,ImGuiInputFlags flags,ImGuiID owner_id);
 CIMGUI_API bool igIsMouseReleased_ID(ImGuiMouseButton button,ImGuiID owner_id);
 CIMGUI_API bool igIsMouseDoubleClicked_ID(ImGuiMouseButton button,ImGuiID owner_id);
-CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
-CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord);
-CIMGUI_API bool igShortcut(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
-CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
+CIMGUI_API bool igShortcut_ID(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id);
+CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id);
 CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id);
 CIMGUI_API ImGuiKeyRoutingData* igGetShortcutRoutingData(ImGuiKeyChord key_chord);
 CIMGUI_API void igDockContextInitialize(ImGuiContext* ctx);
@@ -4691,7 +4709,7 @@ CIMGUI_API void igSetNextItemSelectionUserData(ImGuiSelectionUserData selection_
 CIMGUI_API const ImGuiDataTypeInfo* igDataTypeGetInfo(ImGuiDataType data_type);
 CIMGUI_API int igDataTypeFormatString(char* buf,int buf_size,ImGuiDataType data_type,const void* p_data,const char* format);
 CIMGUI_API void igDataTypeApplyOp(ImGuiDataType data_type,int op,void* output,const void* arg_1,const void* arg_2);
-CIMGUI_API bool igDataTypeApplyFromText(const char* buf,ImGuiDataType data_type,void* p_data,const char* format);
+CIMGUI_API bool igDataTypeApplyFromText(const char* buf,ImGuiDataType data_type,void* p_data,const char* format,void* p_data_when_empty);
 CIMGUI_API int igDataTypeCompare(ImGuiDataType data_type,const void* arg_1,const void* arg_2);
 CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max);
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
@@ -4700,6 +4718,7 @@ CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,cha
 CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max);
 CIMGUI_API bool igTempInputIsActive(ImGuiID id);
 CIMGUI_API ImGuiInputTextState* igGetInputTextState(ImGuiID id);
+CIMGUI_API void igSetNextItemRefVal(ImGuiDataType data_type,void* p_data);
 CIMGUI_API void igColorTooltip(const char* text,const float* col,ImGuiColorEditFlags flags);
 CIMGUI_API void igColorEditOptionsPopup(const float* col,ImGuiColorEditFlags flags);
 CIMGUI_API void igColorPickerOptionsPopup(const float* ref_col,ImGuiColorEditFlags flags);
@@ -4719,6 +4738,7 @@ CIMGUI_API void igErrorCheckUsingSetCursorPosToExtendParentBoundaries(void);
 CIMGUI_API void igDebugDrawCursorPos(ImU32 col);
 CIMGUI_API void igDebugDrawLineExtents(ImU32 col);
 CIMGUI_API void igDebugDrawItemRect(ImU32 col);
+CIMGUI_API void igDebugTextUnformattedWithLocateItem(const char* line_begin,const char* line_end);
 CIMGUI_API void igDebugLocateItem(ImGuiID target_id);
 CIMGUI_API void igDebugLocateItemOnHover(ImGuiID target_id);
 CIMGUI_API void igDebugLocateItemResolveWithLastItem(void);
@@ -4774,6 +4794,10 @@ CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);

+#ifdef IMGUI_HAS_DOCK
+CIMGUI_API void ImGuiPlatformIO_Set_Platform_GetWindowPos(ImGuiPlatformIO* platform_io, void(*user_callback)(ImGuiViewport* vp, ImVec2* out_pos));
+CIMGUI_API void ImGuiPlatformIO_Set_Platform_GetWindowSize(ImGuiPlatformIO* platform_io, void(*user_callback)(ImGuiViewport* vp, ImVec2* out_size));
+#endif

 #endif //CIMGUI_INCLUDED

--- a/generator/cimgui_template.h
+++ b/generator/cimgui_template.h
@@ -61,6 +61,10 @@ CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);

+#ifdef IMGUI_HAS_DOCK
+CIMGUI_API void ImGuiPlatformIO_Set_Platform_GetWindowPos(ImGuiPlatformIO* platform_io, void(*user_callback)(ImGuiViewport* vp, ImVec2* out_pos));
+CIMGUI_API void ImGuiPlatformIO_Set_Platform_GetWindowSize(ImGuiPlatformIO* platform_io, void(*user_callback)(ImGuiViewport* vp, ImVec2* out_size));
+#endif

 #endif //CIMGUI_INCLUDED

--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -751,6 +751,8 @@ local function parseFunction(self,stname,itt,namespace,locat)
 	local argsTa2 = {}
 	local noname_counter = 0
 	for i,ar in ipairs(argsTa) do
+		--avoid var name without space type&name -> type& name
+		ar = ar:gsub("&(%S)","& %1")
 		local typ,name,retf,sigf,reftoptr,defa,ar1
 		local has_cdecl = ar:match"__cdecl"
 		if has_cdecl then ar = ar:gsub("__cdecl","") end
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -163,19 +163,19 @@ igImTrunc	2
 2	ImVec2	igImTrunc_Vec2 (const ImVec2)
 igIsKeyChordPressed	2
 1	bool	igIsKeyChordPressed_Nil (ImGuiKeyChord)
-2	bool	igIsKeyChordPressed_ID (ImGuiKeyChord,ImGuiID,ImGuiInputFlags)
+2	bool	igIsKeyChordPressed_InputFlags (ImGuiKeyChord,ImGuiInputFlags,ImGuiID)
 igIsKeyDown	2
 1	bool	igIsKeyDown_Nil (ImGuiKey)
 2	bool	igIsKeyDown_ID (ImGuiKey,ImGuiID)
 igIsKeyPressed	2
 1	bool	igIsKeyPressed_Bool (ImGuiKey,bool)
-2	bool	igIsKeyPressed_ID (ImGuiKey,ImGuiID,ImGuiInputFlags)
+2	bool	igIsKeyPressed_InputFlags (ImGuiKey,ImGuiInputFlags,ImGuiID)
 igIsKeyReleased	2
 1	bool	igIsKeyReleased_Nil (ImGuiKey)
 2	bool	igIsKeyReleased_ID (ImGuiKey,ImGuiID)
 igIsMouseClicked	2
 1	bool	igIsMouseClicked_Bool (ImGuiMouseButton,bool)
-2	bool	igIsMouseClicked_ID (ImGuiMouseButton,ImGuiID,ImGuiInputFlags)
+2	bool	igIsMouseClicked_InputFlags (ImGuiMouseButton,ImGuiInputFlags,ImGuiID)
 igIsMouseDoubleClicked	2
 1	bool	igIsMouseDoubleClicked_Nil (ImGuiMouseButton)
 2	bool	igIsMouseDoubleClicked_ID (ImGuiMouseButton,ImGuiID)
@@ -256,6 +256,9 @@ igSetWindowSize	3
 1	void	igSetWindowSize_Vec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSize_Str (const char*,const ImVec2,ImGuiCond)
 3	void	igSetWindowSize_WindowPtr (ImGuiWindow*,const ImVec2,ImGuiCond)
+igShortcut	2
+1	bool	igShortcut_Nil (ImGuiKeyChord,ImGuiInputFlags)
+2	bool	igShortcut_ID (ImGuiKeyChord,ImGuiInputFlags,ImGuiID)
 igTabItemCalcSize	2
 1	ImVec2	igTabItemCalcSize_Str (const char*,bool)
 2	ImVec2	igTabItemCalcSize_WindowPtr (ImGuiWindow*)
@@ -287,4 +290,4 @@ igValue	4
 2	void	igValue_Int (const char*,int)
 3	void	igValue_Uint (const char*,unsigned int)
 4	void	igValue_Float (const char*,float,const char*)
-201 overloaded
+203 overloaded
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -334,11 +334,6 @@
        "calc_value": 7,
        "name": "ImGuiButtonFlags_MouseButtonMask_",
        "value": "ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle"
-      },
-      {
-        "calc_value": 1,
-        "name": "ImGuiButtonFlags_MouseButtonDefault_",
-        "value": "ImGuiButtonFlags_MouseButtonLeft"
      }
    ],
    "ImGuiChildFlags_": [
@@ -1175,7 +1170,7 @@
        "value": "1 << 21"
      }
    ],
-    "ImGuiDir_": [
+    "ImGuiDir": [
      {
        "calc_value": -1,
        "name": "ImGuiDir_None",
@@ -1645,17 +1640,7 @@
        "value": "8"
      }
    ],
-    "ImGuiInputFlags_": [
-      {
-        "calc_value": 0,
-        "name": "ImGuiInputFlags_None",
-        "value": "0"
-      },
-      {
-        "calc_value": 1,
-        "name": "ImGuiInputFlags_Repeat",
-        "value": "1 << 0"
-      },
+    "ImGuiInputFlagsPrivate_": [
      {
        "calc_value": 2,
        "name": "ImGuiInputFlags_RepeatRateDefault",
@@ -1692,60 +1677,30 @@
        "value": "1 << 7"
      },
      {
-        "calc_value": 256,
+        "calc_value": 1048576,
+        "name": "ImGuiInputFlags_LockThisFrame",
+        "value": "1 << 20"
+      },
+      {
+        "calc_value": 2097152,
+        "name": "ImGuiInputFlags_LockUntilRelease",
+        "value": "1 << 21"
+      },
+      {
+        "calc_value": 4194304,
        "name": "ImGuiInputFlags_CondHovered",
-        "value": "1 << 8"
+        "value": "1 << 22"
      },
      {
-        "calc_value": 512,
+        "calc_value": 8388608,
        "name": "ImGuiInputFlags_CondActive",
-        "value": "1 << 9"
+        "value": "1 << 23"
      },
      {
-        "calc_value": 768,
+        "calc_value": 12582912,
        "name": "ImGuiInputFlags_CondDefault_",
        "value": "ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive"
      },
-      {
-        "calc_value": 1024,
-        "name": "ImGuiInputFlags_LockThisFrame",
-        "value": "1 << 10"
-      },
-      {
-        "calc_value": 2048,
-        "name": "ImGuiInputFlags_LockUntilRelease",
-        "value": "1 << 11"
-      },
-      {
-        "calc_value": 4096,
-        "name": "ImGuiInputFlags_RouteFocused",
-        "value": "1 << 12"
-      },
-      {
-        "calc_value": 8192,
-        "name": "ImGuiInputFlags_RouteGlobalLow",
-        "value": "1 << 13"
-      },
-      {
-        "calc_value": 16384,
-        "name": "ImGuiInputFlags_RouteGlobal",
-        "value": "1 << 14"
-      },
-      {
-        "calc_value": 32768,
-        "name": "ImGuiInputFlags_RouteGlobalHigh",
-        "value": "1 << 15"
-      },
-      {
-        "calc_value": 65536,
-        "name": "ImGuiInputFlags_RouteAlways",
-        "value": "1 << 16"
-      },
-      {
-        "calc_value": 131072,
-        "name": "ImGuiInputFlags_RouteUnlessBgFocused",
-        "value": "1 << 17"
-      },
      {
        "calc_value": 14,
        "name": "ImGuiInputFlags_RepeatRateMask_",
@@ -1762,14 +1717,19 @@
        "value": "ImGuiInputFlags_Repeat | ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_"
      },
      {
-        "calc_value": 768,
+        "calc_value": 12582912,
        "name": "ImGuiInputFlags_CondMask_",
        "value": "ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive"
      },
      {
-        "calc_value": 61440,
-        "name": "ImGuiInputFlags_RouteMask_",
-        "value": "ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh"
+        "calc_value": 15360,
+        "name": "ImGuiInputFlags_RouteTypeMask_",
+        "value": "ImGuiInputFlags_RouteActive | ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteAlways"
+      },
+      {
+        "calc_value": 245760,
+        "name": "ImGuiInputFlags_RouteOptionsMask_",
+        "value": "ImGuiInputFlags_RouteOverFocused | ImGuiInputFlags_RouteOverActive | ImGuiInputFlags_RouteUnlessBgFocused | ImGuiInputFlags_RouteFromRootWindow"
      },
      {
        "calc_value": 255,
@@ -1782,21 +1742,83 @@
        "value": "ImGuiInputFlags_Repeat"
      },
      {
-        "calc_value": 258303,
+        "calc_value": 261375,
        "name": "ImGuiInputFlags_SupportedByShortcut",
-        "value": "ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused"
+        "value": "ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_"
      },
      {
-        "calc_value": 3072,
+        "calc_value": 523519,
+        "name": "ImGuiInputFlags_SupportedBySetNextItemShortcut",
+        "value": "ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteTypeMask_ | ImGuiInputFlags_RouteOptionsMask_ | ImGuiInputFlags_Tooltip"
+      },
+      {
+        "calc_value": 3145728,
        "name": "ImGuiInputFlags_SupportedBySetKeyOwner",
        "value": "ImGuiInputFlags_LockThisFrame | ImGuiInputFlags_LockUntilRelease"
      },
      {
-        "calc_value": 3840,
+        "calc_value": 15728640,
        "name": "ImGuiInputFlags_SupportedBySetItemKeyOwner",
        "value": "ImGuiInputFlags_SupportedBySetKeyOwner | ImGuiInputFlags_CondMask_"
      }
    ],
+    "ImGuiInputFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiInputFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiInputFlags_Repeat",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 1024,
+        "name": "ImGuiInputFlags_RouteActive",
+        "value": "1 << 10"
+      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiInputFlags_RouteFocused",
+        "value": "1 << 11"
+      },
+      {
+        "calc_value": 4096,
+        "name": "ImGuiInputFlags_RouteGlobal",
+        "value": "1 << 12"
+      },
+      {
+        "calc_value": 8192,
+        "name": "ImGuiInputFlags_RouteAlways",
+        "value": "1 << 13"
+      },
+      {
+        "calc_value": 16384,
+        "name": "ImGuiInputFlags_RouteOverFocused",
+        "value": "1 << 14"
+      },
+      {
+        "calc_value": 32768,
+        "name": "ImGuiInputFlags_RouteOverActive",
+        "value": "1 << 15"
+      },
+      {
+        "calc_value": 65536,
+        "name": "ImGuiInputFlags_RouteUnlessBgFocused",
+        "value": "1 << 16"
+      },
+      {
+        "calc_value": 131072,
+        "name": "ImGuiInputFlags_RouteFromRootWindow",
+        "value": "1 << 17"
+      },
+      {
+        "calc_value": 262144,
+        "name": "ImGuiInputFlags_Tooltip",
+        "value": "1 << 18"
+      }
+    ],
    "ImGuiInputSource": [
      {
        "calc_value": 0,
@@ -1864,72 +1886,72 @@
      },
      {
        "calc_value": 4,
-        "name": "ImGuiInputTextFlags_CharsUppercase",
+        "name": "ImGuiInputTextFlags_CharsScientific",
        "value": "1 << 2"
      },
      {
        "calc_value": 8,
-        "name": "ImGuiInputTextFlags_CharsNoBlank",
+        "name": "ImGuiInputTextFlags_CharsUppercase",
        "value": "1 << 3"
      },
      {
        "calc_value": 16,
-        "name": "ImGuiInputTextFlags_AutoSelectAll",
+        "name": "ImGuiInputTextFlags_CharsNoBlank",
        "value": "1 << 4"
      },
      {
        "calc_value": 32,
-        "name": "ImGuiInputTextFlags_EnterReturnsTrue",
+        "name": "ImGuiInputTextFlags_AllowTabInput",
        "value": "1 << 5"
      },
      {
        "calc_value": 64,
-        "name": "ImGuiInputTextFlags_CallbackCompletion",
+        "name": "ImGuiInputTextFlags_EnterReturnsTrue",
        "value": "1 << 6"
      },
      {
        "calc_value": 128,
-        "name": "ImGuiInputTextFlags_CallbackHistory",
+        "name": "ImGuiInputTextFlags_EscapeClearsAll",
        "value": "1 << 7"
      },
      {
        "calc_value": 256,
-        "name": "ImGuiInputTextFlags_CallbackAlways",
+        "name": "ImGuiInputTextFlags_CtrlEnterForNewLine",
        "value": "1 << 8"
      },
      {
        "calc_value": 512,
-        "name": "ImGuiInputTextFlags_CallbackCharFilter",
+        "name": "ImGuiInputTextFlags_ReadOnly",
        "value": "1 << 9"
      },
      {
        "calc_value": 1024,
-        "name": "ImGuiInputTextFlags_AllowTabInput",
+        "name": "ImGuiInputTextFlags_Password",
        "value": "1 << 10"
      },
      {
        "calc_value": 2048,
-        "name": "ImGuiInputTextFlags_CtrlEnterForNewLine",
+        "name": "ImGuiInputTextFlags_AlwaysOverwrite",
        "value": "1 << 11"
      },
      {
        "calc_value": 4096,
-        "name": "ImGuiInputTextFlags_NoHorizontalScroll",
+        "name": "ImGuiInputTextFlags_AutoSelectAll",
        "value": "1 << 12"
      },
      {
        "calc_value": 8192,
-        "name": "ImGuiInputTextFlags_AlwaysOverwrite",
+        "name": "ImGuiInputTextFlags_ParseEmptyRefVal",
        "value": "1 << 13"
      },
      {
        "calc_value": 16384,
-        "name": "ImGuiInputTextFlags_ReadOnly",
+        "name": "ImGuiInputTextFlags_DisplayEmptyRefVal",
        "value": "1 << 14"
      },
      {
        "calc_value": 32768,
-        "name": "ImGuiInputTextFlags_Password",
+        "name": "ImGuiInputTextFlags_NoHorizontalScroll",
        "value": "1 << 15"
      },
      {
@@ -1939,23 +1961,33 @@
      },
      {
        "calc_value": 131072,
-        "name": "ImGuiInputTextFlags_CharsScientific",
+        "name": "ImGuiInputTextFlags_CallbackCompletion",
        "value": "1 << 17"
      },
      {
        "calc_value": 262144,
-        "name": "ImGuiInputTextFlags_CallbackResize",
+        "name": "ImGuiInputTextFlags_CallbackHistory",
        "value": "1 << 18"
      },
      {
        "calc_value": 524288,
-        "name": "ImGuiInputTextFlags_CallbackEdit",
+        "name": "ImGuiInputTextFlags_CallbackAlways",
        "value": "1 << 19"
      },
      {
        "calc_value": 1048576,
-        "name": "ImGuiInputTextFlags_EscapeClearsAll",
+        "name": "ImGuiInputTextFlags_CallbackCharFilter",
        "value": "1 << 20"
+      },
+      {
+        "calc_value": 2097152,
+        "name": "ImGuiInputTextFlags_CallbackResize",
+        "value": "1 << 21"
+      },
+      {
+        "calc_value": 4194304,
+        "name": "ImGuiInputTextFlags_CallbackEdit",
+        "value": "1 << 22"
      }
    ],
    "ImGuiItemFlags_": [
@@ -2080,6 +2112,11 @@
        "calc_value": 512,
        "name": "ImGuiItemStatusFlags_HasClipRect",
        "value": "1 << 9"
+      },
+      {
+        "calc_value": 1024,
+        "name": "ImGuiItemStatusFlags_HasShortcut",
+        "value": "1 << 10"
      }
    ],
    "ImGuiKey": [
@@ -2889,14 +2926,9 @@
        "value": "1 << 15"
      },
      {
-        "calc_value": 2048,
-        "name": "ImGuiMod_Shortcut",
-        "value": "1 << 11"
-      },
-      {
-        "calc_value": 63488,
+        "calc_value": 61440,
        "name": "ImGuiMod_Mask_",
-        "value": "0xF800"
+        "value": "0xF000"
      },
      {
        "calc_value": 512,
@@ -3277,6 +3309,11 @@
        "calc_value": 4,
        "name": "ImGuiNextItemDataFlags_HasShortcut",
        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiNextItemDataFlags_HasRefVal",
+        "value": "1 << 3"
      }
    ],
    "ImGuiNextWindowDataFlags_": [
@@ -3666,7 +3703,7 @@
        "value": "0x7000000F"
      }
    ],
-    "ImGuiSortDirection_": [
+    "ImGuiSortDirection": [
      {
        "calc_value": 0,
        "name": "ImGuiSortDirection_None",
@@ -4806,196 +4843,199 @@
    ]
  },
  "enumtypes": {
+    "ImGuiDir": "int",
    "ImGuiKey": "int",
    "ImGuiLocKey": "int",
-    "ImGuiMouseSource": "int"
+    "ImGuiMouseSource": "int",
+    "ImGuiSortDirection": "ImU8"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:620",
-    "ImColor": "imgui:2682",
-    "ImDrawChannel": "imgui:2772",
-    "ImDrawCmd": "imgui:2731",
-    "ImDrawCmdHeader": "imgui:2764",
-    "ImDrawData": "imgui:2976",
-    "ImDrawDataBuilder": "imgui_internal:806",
-    "ImDrawFlags_": "imgui:2798",
-    "ImDrawList": "imgui:2836",
-    "ImDrawListFlags_": "imgui:2818",
-    "ImDrawListSharedData": "imgui_internal:783",
-    "ImDrawListSplitter": "imgui:2781",
-    "ImDrawVert": "imgui:2749",
-    "ImFont": "imgui:3199",
-    "ImFontAtlas": "imgui:3095",
-    "ImFontAtlasCustomRect": "imgui:3057",
-    "ImFontAtlasFlags_": "imgui:3070",
-    "ImFontBuilderIO": "imgui_internal:3880",
-    "ImFontConfig": "imgui:3000",
-    "ImFontGlyph": "imgui:3030",
-    "ImFontGlyphRangesBuilder": "imgui:3042",
-    "ImGuiActivateFlags_": "imgui_internal:1569",
-    "ImGuiAxis": "imgui_internal:994",
-    "ImGuiBackendFlags_": "imgui:1555",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:888",
-    "ImGuiButtonFlags_": "imgui:1678",
-    "ImGuiChildFlags_": "imgui:1089",
-    "ImGuiCol_": "imgui:1570",
-    "ImGuiColorEditFlags_": "imgui:1691",
-    "ImGuiColorMod": "imgui_internal:1008",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:913",
-    "ImGuiComboFlags_": "imgui:1202",
-    "ImGuiComboPreviewData": "imgui_internal:1025",
-    "ImGuiCond_": "imgui:1792",
-    "ImGuiConfigFlags_": "imgui:1530",
-    "ImGuiContext": "imgui_internal:2126",
-    "ImGuiContextHook": "imgui_internal:2111",
-    "ImGuiContextHookType": "imgui_internal:2109",
-    "ImGuiDataAuthority_": "imgui_internal:1796",
-    "ImGuiDataTypeInfo": "imgui_internal:1301",
-    "ImGuiDataTypePrivate_": "imgui_internal:1310",
-    "ImGuiDataTypeTempStorage": "imgui_internal:1295",
-    "ImGuiDataType_": "imgui:1343",
-    "ImGuiDataVarInfo": "imgui_internal:1287",
-    "ImGuiDebugAllocEntry": "imgui_internal:2045",
-    "ImGuiDebugAllocInfo": "imgui_internal:2052",
-    "ImGuiDebugLogFlags_": "imgui_internal:2025",
-    "ImGuiDir_": "imgui:1359",
-    "ImGuiDockContext": "imgui_internal:1896",
-    "ImGuiDockNode": "imgui_internal:1812",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1767",
-    "ImGuiDockNodeFlags_": "imgui:1302",
-    "ImGuiDockNodeState": "imgui_internal:1803",
-    "ImGuiDragDropFlags_": "imgui:1321",
-    "ImGuiFocusRequestFlags_": "imgui_internal:957",
-    "ImGuiFocusScopeData": "imgui_internal:1647",
-    "ImGuiFocusedFlags_": "imgui:1248",
-    "ImGuiGroupData": "imgui_internal:1038",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:870",
-    "ImGuiHoveredFlags_": "imgui:1262",
-    "ImGuiIDStackTool": "imgui_internal:2092",
-    "ImGuiIO": "imgui:2152",
-    "ImGuiInputEvent": "imgui_internal:1404",
-    "ImGuiInputEventAppFocused": "imgui_internal:1402",
-    "ImGuiInputEventKey": "imgui_internal:1400",
-    "ImGuiInputEventMouseButton": "imgui_internal:1398",
-    "ImGuiInputEventMousePos": "imgui_internal:1396",
-    "ImGuiInputEventMouseViewport": "imgui_internal:1399",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1397",
-    "ImGuiInputEventText": "imgui_internal:1401",
-    "ImGuiInputEventType": "imgui_internal:1372",
-    "ImGuiInputFlags_": "imgui_internal:1469",
-    "ImGuiInputSource": "imgui_internal:1385",
-    "ImGuiInputTextCallbackData": "imgui:2372",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1074",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:878",
-    "ImGuiInputTextFlags_": "imgui:1104",
-    "ImGuiInputTextState": "imgui_internal:1084",
-    "ImGuiItemFlags_": "imgui_internal:823",
-    "ImGuiItemStatusFlags_": "imgui_internal:845",
-    "ImGuiKey": "imgui:1388",
-    "ImGuiKeyData": "imgui:2144",
-    "ImGuiKeyOwnerData": "imgui_internal:1457",
-    "ImGuiKeyRoutingData": "imgui_internal:1431",
-    "ImGuiKeyRoutingTable": "imgui_internal:1445",
-    "ImGuiLastItemData": "imgui_internal:1218",
-    "ImGuiLayoutType_": "imgui_internal:978",
-    "ImGuiListClipper": "imgui:2596",
-    "ImGuiListClipperData": "imgui_internal:1553",
-    "ImGuiListClipperRange": "imgui_internal:1540",
-    "ImGuiLocEntry": "imgui_internal:2014",
-    "ImGuiLocKey": "imgui_internal:1998",
-    "ImGuiLogType": "imgui_internal:984",
-    "ImGuiMenuColumns": "imgui_internal:1056",
-    "ImGuiMetricsConfig": "imgui_internal:2062",
-    "ImGuiMouseButton_": "imgui:1752",
-    "ImGuiMouseCursor_": "imgui:1762",
-    "ImGuiMouseSource": "imgui:1781",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1594",
-    "ImGuiNavItemData": "imgui_internal:1631",
-    "ImGuiNavLayer": "imgui_internal:1624",
-    "ImGuiNavMoveFlags_": "imgui_internal:1602",
-    "ImGuiNavTreeNodeData": "imgui_internal:1235",
-    "ImGuiNextItemData": "imgui_internal:1202",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1194",
-    "ImGuiNextWindowData": "imgui_internal:1161",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1142",
-    "ImGuiOldColumnData": "imgui_internal:1715",
-    "ImGuiOldColumnFlags_": "imgui_internal:1695",
-    "ImGuiOldColumns": "imgui_internal:1725",
-    "ImGuiOnceUponAFrame": "imgui:2472",
-    "ImGuiPayload": "imgui:2437",
-    "ImGuiPlatformIO": "imgui:3369",
-    "ImGuiPlatformImeData": "imgui:3442",
-    "ImGuiPlatformMonitor": "imgui:3432",
-    "ImGuiPlotType": "imgui_internal:1001",
-    "ImGuiPopupData": "imgui_internal:1329",
-    "ImGuiPopupFlags_": "imgui:1169",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1321",
-    "ImGuiPtrOrIndex": "imgui_internal:1274",
-    "ImGuiScrollFlags_": "imgui_internal:1580",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:926",
-    "ImGuiSelectableFlags_": "imgui:1187",
-    "ImGuiSeparatorFlags_": "imgui_internal:946",
-    "ImGuiSettingsHandler": "imgui_internal:1978",
-    "ImGuiShrinkWidthItem": "imgui_internal:1267",
-    "ImGuiSizeCallbackData": "imgui:2406",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:919",
-    "ImGuiSliderFlags_": "imgui:1737",
-    "ImGuiSortDirection_": "imgui:1370",
-    "ImGuiStackLevelInfo": "imgui_internal:2080",
-    "ImGuiStackSizes": "imgui_internal:1242",
-    "ImGuiStorage": "imgui:2534",
-    "ImGuiStoragePair": "imgui:2537",
-    "ImGuiStyle": "imgui:2069",
-    "ImGuiStyleMod": "imgui_internal:1015",
-    "ImGuiStyleVar_": "imgui:1638",
-    "ImGuiTabBar": "imgui_internal:2925",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2888",
-    "ImGuiTabBarFlags_": "imgui:1217",
-    "ImGuiTabItem": "imgui_internal:2905",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2896",
-    "ImGuiTabItemFlags_": "imgui:1233",
-    "ImGuiTable": "imgui_internal:3071",
-    "ImGuiTableBgTarget_": "imgui:1933",
-    "ImGuiTableCellData": "imgui_internal:3038",
-    "ImGuiTableColumn": "imgui_internal:2979",
-    "ImGuiTableColumnFlags_": "imgui:1880",
-    "ImGuiTableColumnSettings": "imgui_internal:3217",
-    "ImGuiTableColumnSortSpecs": "imgui:1955",
-    "ImGuiTableFlags_": "imgui:1827",
-    "ImGuiTableHeaderData": "imgui_internal:3047",
-    "ImGuiTableInstanceData": "imgui_internal:3057",
-    "ImGuiTableRowFlags_": "imgui:1918",
-    "ImGuiTableSettings": "imgui_internal:3241",
-    "ImGuiTableSortSpecs": "imgui:1945",
-    "ImGuiTableTempData": "imgui_internal:3194",
-    "ImGuiTextBuffer": "imgui:2507",
-    "ImGuiTextFilter": "imgui:2480",
-    "ImGuiTextFlags_": "imgui_internal:964",
-    "ImGuiTextIndex": "imgui_internal:740",
-    "ImGuiTextRange": "imgui:2490",
-    "ImGuiTooltipFlags_": "imgui_internal:970",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:940",
-    "ImGuiTreeNodeFlags_": "imgui:1134",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1658",
-    "ImGuiTypingSelectRequest": "imgui_internal:1666",
-    "ImGuiTypingSelectState": "imgui_internal:1677",
-    "ImGuiViewport": "imgui:3285",
-    "ImGuiViewportFlags_": "imgui:3257",
-    "ImGuiViewportP": "imgui_internal:1913",
-    "ImGuiWindow": "imgui_internal:2736",
-    "ImGuiWindowClass": "imgui:2421",
-    "ImGuiWindowDockStyle": "imgui_internal:1891",
-    "ImGuiWindowDockStyleCol": "imgui_internal:1879",
-    "ImGuiWindowFlags_": "imgui:1038",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1133",
-    "ImGuiWindowSettings": "imgui_internal:1959",
-    "ImGuiWindowStackData": "imgui_internal:1260",
-    "ImGuiWindowTempData": "imgui_internal:2686",
-    "ImRect": "imgui_internal:542",
-    "ImVec1": "imgui_internal:524",
-    "ImVec2": "imgui:276",
-    "ImVec2ih": "imgui_internal:532",
-    "ImVec4": "imgui:289",
+    "ImBitVector": "imgui_internal:619",
+    "ImColor": "imgui:2738",
+    "ImDrawChannel": "imgui:2828",
+    "ImDrawCmd": "imgui:2787",
+    "ImDrawCmdHeader": "imgui:2820",
+    "ImDrawData": "imgui:3032",
+    "ImDrawDataBuilder": "imgui_internal:805",
+    "ImDrawFlags_": "imgui:2854",
+    "ImDrawList": "imgui:2892",
+    "ImDrawListFlags_": "imgui:2874",
+    "ImDrawListSharedData": "imgui_internal:782",
+    "ImDrawListSplitter": "imgui:2837",
+    "ImDrawVert": "imgui:2805",
+    "ImFont": "imgui:3255",
+    "ImFontAtlas": "imgui:3151",
+    "ImFontAtlasCustomRect": "imgui:3113",
+    "ImFontAtlasFlags_": "imgui:3126",
+    "ImFontBuilderIO": "imgui_internal:3870",
+    "ImFontConfig": "imgui:3056",
+    "ImFontGlyph": "imgui:3086",
+    "ImFontGlyphRangesBuilder": "imgui:3098",
+    "ImGuiActivateFlags_": "imgui_internal:1549",
+    "ImGuiAxis": "imgui_internal:1028",
+    "ImGuiBackendFlags_": "imgui:1612",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:922",
+    "ImGuiButtonFlags_": "imgui:1735",
+    "ImGuiChildFlags_": "imgui:1111",
+    "ImGuiCol_": "imgui:1627",
+    "ImGuiColorEditFlags_": "imgui:1746",
+    "ImGuiColorMod": "imgui_internal:1042",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:947",
+    "ImGuiComboFlags_": "imgui:1233",
+    "ImGuiComboPreviewData": "imgui_internal:1059",
+    "ImGuiCond_": "imgui:1847",
+    "ImGuiConfigFlags_": "imgui:1587",
+    "ImGuiContext": "imgui_internal:2108",
+    "ImGuiContextHook": "imgui_internal:2093",
+    "ImGuiContextHookType": "imgui_internal:2091",
+    "ImGuiDataAuthority_": "imgui_internal:1778",
+    "ImGuiDataTypeInfo": "imgui_internal:831",
+    "ImGuiDataTypePrivate_": "imgui_internal:840",
+    "ImGuiDataTypeStorage": "imgui_internal:825",
+    "ImGuiDataType_": "imgui:1374",
+    "ImGuiDataVarInfo": "imgui_internal:817",
+    "ImGuiDebugAllocEntry": "imgui_internal:2027",
+    "ImGuiDebugAllocInfo": "imgui_internal:2034",
+    "ImGuiDebugLogFlags_": "imgui_internal:2007",
+    "ImGuiDir": "imgui:1390",
+    "ImGuiDockContext": "imgui_internal:1878",
+    "ImGuiDockNode": "imgui_internal:1794",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1749",
+    "ImGuiDockNodeFlags_": "imgui:1333",
+    "ImGuiDockNodeState": "imgui_internal:1785",
+    "ImGuiDragDropFlags_": "imgui:1352",
+    "ImGuiFocusRequestFlags_": "imgui_internal:991",
+    "ImGuiFocusScopeData": "imgui_internal:1629",
+    "ImGuiFocusedFlags_": "imgui:1279",
+    "ImGuiGroupData": "imgui_internal:1072",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:904",
+    "ImGuiHoveredFlags_": "imgui:1293",
+    "ImGuiIDStackTool": "imgui_internal:2074",
+    "ImGuiIO": "imgui:2207",
+    "ImGuiInputEvent": "imgui_internal:1409",
+    "ImGuiInputEventAppFocused": "imgui_internal:1407",
+    "ImGuiInputEventKey": "imgui_internal:1405",
+    "ImGuiInputEventMouseButton": "imgui_internal:1403",
+    "ImGuiInputEventMousePos": "imgui_internal:1401",
+    "ImGuiInputEventMouseViewport": "imgui_internal:1404",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1402",
+    "ImGuiInputEventText": "imgui_internal:1406",
+    "ImGuiInputEventType": "imgui_internal:1377",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1476",
+    "ImGuiInputFlags_": "imgui:1552",
+    "ImGuiInputSource": "imgui_internal:1390",
+    "ImGuiInputTextCallbackData": "imgui:2428",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1108",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:912",
+    "ImGuiInputTextFlags_": "imgui:1126",
+    "ImGuiInputTextState": "imgui_internal:1118",
+    "ImGuiItemFlags_": "imgui_internal:856",
+    "ImGuiItemStatusFlags_": "imgui_internal:878",
+    "ImGuiKey": "imgui:1419",
+    "ImGuiKeyData": "imgui:2199",
+    "ImGuiKeyOwnerData": "imgui_internal:1463",
+    "ImGuiKeyRoutingData": "imgui_internal:1437",
+    "ImGuiKeyRoutingTable": "imgui_internal:1451",
+    "ImGuiLastItemData": "imgui_internal:1255",
+    "ImGuiLayoutType_": "imgui_internal:1012",
+    "ImGuiListClipper": "imgui:2652",
+    "ImGuiListClipperData": "imgui_internal:1533",
+    "ImGuiListClipperRange": "imgui_internal:1520",
+    "ImGuiLocEntry": "imgui_internal:1996",
+    "ImGuiLocKey": "imgui_internal:1980",
+    "ImGuiLogType": "imgui_internal:1018",
+    "ImGuiMenuColumns": "imgui_internal:1090",
+    "ImGuiMetricsConfig": "imgui_internal:2044",
+    "ImGuiMouseButton_": "imgui:1807",
+    "ImGuiMouseCursor_": "imgui:1817",
+    "ImGuiMouseSource": "imgui:1836",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1574",
+    "ImGuiNavItemData": "imgui_internal:1612",
+    "ImGuiNavLayer": "imgui_internal:1604",
+    "ImGuiNavMoveFlags_": "imgui_internal:1582",
+    "ImGuiNavTreeNodeData": "imgui_internal:1273",
+    "ImGuiNextItemData": "imgui_internal:1237",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1228",
+    "ImGuiNextWindowData": "imgui_internal:1195",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1176",
+    "ImGuiOldColumnData": "imgui_internal:1697",
+    "ImGuiOldColumnFlags_": "imgui_internal:1677",
+    "ImGuiOldColumns": "imgui_internal:1707",
+    "ImGuiOnceUponAFrame": "imgui:2528",
+    "ImGuiPayload": "imgui:2493",
+    "ImGuiPlatformIO": "imgui:3425",
+    "ImGuiPlatformImeData": "imgui:3498",
+    "ImGuiPlatformMonitor": "imgui:3488",
+    "ImGuiPlotType": "imgui_internal:1035",
+    "ImGuiPopupData": "imgui_internal:1334",
+    "ImGuiPopupFlags_": "imgui:1200",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1326",
+    "ImGuiPtrOrIndex": "imgui_internal:1313",
+    "ImGuiScrollFlags_": "imgui_internal:1560",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:960",
+    "ImGuiSelectableFlags_": "imgui:1218",
+    "ImGuiSeparatorFlags_": "imgui_internal:980",
+    "ImGuiSettingsHandler": "imgui_internal:1960",
+    "ImGuiShrinkWidthItem": "imgui_internal:1306",
+    "ImGuiSizeCallbackData": "imgui:2462",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:953",
+    "ImGuiSliderFlags_": "imgui:1792",
+    "ImGuiSortDirection": "imgui:1401",
+    "ImGuiStackLevelInfo": "imgui_internal:2062",
+    "ImGuiStackSizes": "imgui_internal:1280",
+    "ImGuiStorage": "imgui:2590",
+    "ImGuiStoragePair": "imgui:2593",
+    "ImGuiStyle": "imgui:2124",
+    "ImGuiStyleMod": "imgui_internal:1049",
+    "ImGuiStyleVar_": "imgui:1695",
+    "ImGuiTabBar": "imgui_internal:2913",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2876",
+    "ImGuiTabBarFlags_": "imgui:1248",
+    "ImGuiTabItem": "imgui_internal:2893",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2884",
+    "ImGuiTabItemFlags_": "imgui:1264",
+    "ImGuiTable": "imgui_internal:3058",
+    "ImGuiTableBgTarget_": "imgui:1988",
+    "ImGuiTableCellData": "imgui_internal:3026",
+    "ImGuiTableColumn": "imgui_internal:2967",
+    "ImGuiTableColumnFlags_": "imgui:1935",
+    "ImGuiTableColumnSettings": "imgui_internal:3205",
+    "ImGuiTableColumnSortSpecs": "imgui:2010",
+    "ImGuiTableFlags_": "imgui:1882",
+    "ImGuiTableHeaderData": "imgui_internal:3035",
+    "ImGuiTableInstanceData": "imgui_internal:3045",
+    "ImGuiTableRowFlags_": "imgui:1973",
+    "ImGuiTableSettings": "imgui_internal:3229",
+    "ImGuiTableSortSpecs": "imgui:2000",
+    "ImGuiTableTempData": "imgui_internal:3182",
+    "ImGuiTextBuffer": "imgui:2563",
+    "ImGuiTextFilter": "imgui:2536",
+    "ImGuiTextFlags_": "imgui_internal:998",
+    "ImGuiTextIndex": "imgui_internal:739",
+    "ImGuiTextRange": "imgui:2546",
+    "ImGuiTooltipFlags_": "imgui_internal:1004",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:974",
+    "ImGuiTreeNodeFlags_": "imgui:1165",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1640",
+    "ImGuiTypingSelectRequest": "imgui_internal:1648",
+    "ImGuiTypingSelectState": "imgui_internal:1659",
+    "ImGuiViewport": "imgui:3341",
+    "ImGuiViewportFlags_": "imgui:3313",
+    "ImGuiViewportP": "imgui_internal:1895",
+    "ImGuiWindow": "imgui_internal:2725",
+    "ImGuiWindowClass": "imgui:2477",
+    "ImGuiWindowDockStyle": "imgui_internal:1873",
+    "ImGuiWindowDockStyleCol": "imgui_internal:1861",
+    "ImGuiWindowFlags_": "imgui:1060",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1167",
+    "ImGuiWindowSettings": "imgui_internal:1941",
+    "ImGuiWindowStackData": "imgui_internal:1298",
+    "ImGuiWindowTempData": "imgui_internal:2675",
+    "ImRect": "imgui_internal:541",
+    "ImVec1": "imgui_internal:523",
+    "ImVec2": "imgui:279",
+    "ImVec2ih": "imgui_internal:531",
+    "ImVec4": "imgui:292",
    "STB_TexteditState": "imstb_textedit:321",
    "StbTexteditRow": "imstb_textedit:368",
    "StbUndoRecord": "imstb_textedit:303",
@@ -5713,6 +5753,10 @@
        "name": "FontBaseSize",
        "type": "float"
      },
+      {
+        "name": "CurrentDpiScale",
+        "type": "float"
+      },
      {
        "name": "DrawListSharedData",
        "type": "ImDrawListSharedData"
@@ -5871,6 +5915,14 @@
        "name": "HoveredIdPreviousFrame",
        "type": "ImGuiID"
      },
+      {
+        "name": "HoveredIdTimer",
+        "type": "float"
+      },
+      {
+        "name": "HoveredIdNotActiveTimer",
+        "type": "float"
+      },
      {
        "name": "HoveredIdAllowOverlap",
        "type": "bool"
@@ -5880,12 +5932,8 @@
        "type": "bool"
      },
      {
-        "name": "HoveredIdTimer",
-        "type": "float"
-      },
-      {
-        "name": "HoveredIdNotActiveTimer",
-        "type": "float"
+        "name": "ItemUnclipByLog",
+        "type": "bool"
      },
      {
        "name": "ActiveId",
@@ -6087,10 +6135,6 @@
        "template_type": "ImGuiViewportP*",
        "type": "ImVector_ImGuiViewportPPtr"
      },
-      {
-        "name": "CurrentDpiScale",
-        "type": "float"
-      },
      {
        "name": "CurrentViewport",
        "type": "ImGuiViewportP*"
@@ -6139,11 +6183,6 @@
        "name": "NavFocusScopeId",
        "type": "ImGuiID"
      },
-      {
-        "name": "NavFocusRoute",
-        "template_type": "ImGuiFocusScopeData",
-        "type": "ImVector_ImGuiFocusScopeData"
-      },
      {
        "name": "NavActivateId",
        "type": "ImGuiID"
@@ -6160,6 +6199,11 @@
        "name": "NavActivateFlags",
        "type": "ImGuiActivateFlags"
      },
+      {
+        "name": "NavFocusRoute",
+        "template_type": "ImGuiFocusScopeData",
+        "type": "ImVector_ImGuiFocusScopeData"
+      },
      {
        "name": "NavHighlightActivatedId",
        "type": "ImGuiID"
@@ -6538,6 +6582,10 @@
        "name": "TempInputId",
        "type": "ImGuiID"
      },
+      {
+        "name": "DataTypeZeroValue",
+        "type": "ImGuiDataTypeStorage"
+      },
      {
        "name": "BeginMenuDepth",
        "type": "int"
@@ -6586,6 +6634,14 @@
        "name": "WindowResizeRelativeMode",
        "type": "bool"
      },
+      {
+        "name": "ScrollbarSeekMode",
+        "type": "short"
+      },
+      {
+        "name": "ScrollbarClickDeltaToGrabCenter",
+        "type": "float"
+      },
      {
        "name": "SliderGrabClickOffset",
        "type": "float"
@@ -6610,10 +6666,6 @@
        "name": "DragSpeedDefaultRatio",
        "type": "float"
      },
-      {
-        "name": "ScrollbarClickDeltaToGrabCenter",
-        "type": "float"
-      },
      {
        "name": "DisabledAlphaBackup",
        "type": "float"
@@ -6901,7 +6953,7 @@
        "type": "const char*"
      }
    ],
-    "ImGuiDataTypeTempStorage": [
+    "ImGuiDataTypeStorage": [
      {
        "name": "Data[8]",
        "size": 8,
@@ -7616,6 +7668,10 @@
        "name": "MouseWheelRequestAxisSwap",
        "type": "bool"
      },
+      {
+        "name": "MouseCtrlLeftAsRightClick",
+        "type": "bool"
+      },
      {
        "name": "MouseDownDuration[5]",
        "size": 5,
@@ -8015,6 +8071,10 @@
      {
        "name": "ClipRect",
        "type": "ImRect"
+      },
+      {
+        "name": "Shortcut",
+        "type": "ImGuiKeyChord"
      }
    ],
    "ImGuiListClipper": [
@@ -8268,14 +8328,21 @@
        "name": "Shortcut",
        "type": "ImGuiKeyChord"
      },
+      {
+        "name": "ShortcutFlags",
+        "type": "ImGuiInputFlags"
+      },
      {
        "name": "OpenVal",
        "type": "bool"
      },
      {
-        "bitfield": "8",
        "name": "OpenCond",
-        "type": "ImGuiCond"
+        "type": "ImU8"
+      },
+      {
+        "name": "RefVal",
+        "type": "ImGuiDataTypeStorage"
      }
    ],
    "ImGuiNextWindowData": [
@@ -9937,7 +10004,6 @@
        "type": "ImS16"
      },
      {
-        "bitfield": "8",
        "name": "SortDirection",
        "type": "ImGuiSortDirection"
      }
@@ -10425,6 +10491,14 @@
        "name": "WindowBorderSize",
        "type": "float"
      },
+      {
+        "name": "TitleBarHeight",
+        "type": "float"
+      },
+      {
+        "name": "MenuBarHeight",
+        "type": "float"
+      },
      {
        "name": "DecoOuterSizeX1",
        "type": "float"
@@ -10465,6 +10539,10 @@
        "name": "ChildId",
        "type": "ImGuiID"
      },
+      {
+        "name": "PopupId",
+        "type": "ImGuiID"
+      },
      {
        "name": "Scroll",
        "type": "ImVec2"
@@ -10577,10 +10655,6 @@
        "name": "FocusOrder",
        "type": "short"
      },
-      {
-        "name": "PopupId",
-        "type": "ImGuiID"
-      },
      {
        "name": "AutoFitFramesX",
        "type": "ImS8"
@@ -10954,6 +11028,10 @@
      {
        "name": "StackSizesOnBegin",
        "type": "ImGuiStackSizes"
+      },
+      {
+        "name": "DisabledOverrideReenable",
+        "type": "bool"
      }
    ],
    "ImGuiWindowTempData": [
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -42,12 +42,11 @@
  "ImGuiDataAuthority": "int",
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
-  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
+  "ImGuiDataTypeStorage": "struct ImGuiDataTypeStorage",
  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
  "ImGuiDebugAllocEntry": "struct ImGuiDebugAllocEntry",
  "ImGuiDebugAllocInfo": "struct ImGuiDebugAllocInfo",
  "ImGuiDebugLogFlags": "int",
-  "ImGuiDir": "int",
  "ImGuiDockContext": "struct ImGuiDockContext",
  "ImGuiDockNode": "struct ImGuiDockNode",
  "ImGuiDockNodeFlags": "int",
@@ -126,7 +125,6 @@
  "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
  "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
  "ImGuiSliderFlags": "int",
-  "ImGuiSortDirection": "int",
  "ImGuiStackLevelInfo": "struct ImGuiStackLevelInfo",
  "ImGuiStackSizes": "struct ImGuiStackSizes",
  "ImGuiStorage": "struct ImGuiStorage",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -42,12 +42,11 @@ defs["ImGuiContextHookCallback"] = "void(*)(ImGuiContext* ctx,ImGuiContextHook*
 defs["ImGuiDataAuthority"] = "int"
 defs["ImGuiDataType"] = "int"
 defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
-defs["ImGuiDataTypeTempStorage"] = "struct ImGuiDataTypeTempStorage"
+defs["ImGuiDataTypeStorage"] = "struct ImGuiDataTypeStorage"
 defs["ImGuiDataVarInfo"] = "struct ImGuiDataVarInfo"
 defs["ImGuiDebugAllocEntry"] = "struct ImGuiDebugAllocEntry"
 defs["ImGuiDebugAllocInfo"] = "struct ImGuiDebugAllocInfo"
 defs["ImGuiDebugLogFlags"] = "int"
-defs["ImGuiDir"] = "int"
 defs["ImGuiDockContext"] = "struct ImGuiDockContext"
 defs["ImGuiDockNode"] = "struct ImGuiDockNode"
 defs["ImGuiDockNodeFlags"] = "int"
@@ -126,7 +125,6 @@ defs["ImGuiShrinkWidthItem"] = "struct ImGuiShrinkWidthItem"
 defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
 defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiSliderFlags"] = "int"
-defs["ImGuiSortDirection"] = "int"
 defs["ImGuiStackLevelInfo"] = "struct ImGuiStackLevelInfo"
 defs["ImGuiStackSizes"] = "struct ImGuiStackSizes"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
--- a/2
+++ b/2
Author	SHA1	Message	Date
sonoro1234	7c16d31cdb	pull imgui docking 1.90.8 and generate	2024-06-07 13:21:00 +02:00
sonoro1234	b3e02743f2	avoid type&name -> type& name	2024-06-07 13:18:13 +02:00
sonoro1234	155d5961dc	add definitions to cimgui.h (issue #268 )	2024-06-01 12:54:07 +02:00
sonoro1234	a01f163a81	pull imgui 1.90.7 dock and generate	2024-05-28 10:12:28 +02:00