update README.md

pull imgui 1.92.0 - docking and generate

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.92.0 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.92.1 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.

backend_test/example_glfw_opengl3/CMakeLists.txt

@@ -45,10 +45,13 @@ add_compile_definitions("IMGUI_IMPL_OPENGL_LOADER_GL3W")
 option(IMGUI_FREETYPE "add Freetype2" OFF)
 
 if(IMGUI_FREETYPE)
+	message("building with freetype")
 	FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH})
 	list(APPEND IMGUI_LIBRARIES freetype)
 	list(APPEND IMGUI_SOURCES ../../imgui/misc/freetype/imgui_freetype.cpp)
-	add_definitions("-DCIMGUI_FREETYPE=1")
+	#add_definitions("-DCIMGUI_FREETYPE=1")
+	add_definitions("-DIMGUI_ENABLE_FREETYPE=1")
+	add_definitions("-DIMGUI_ENABLE_STB_TRUETYPE=1")
 endif(IMGUI_FREETYPE)
 
 # opengl3

backend_test/example_glfw_opengl3/main.c

@@ -43,8 +43,9 @@ int main(int argc, char *argv[])
 
   // just an extra window hint for resize
   glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
+  float main_scale = ImGui_ImplGlfw_GetContentScaleForMonitor(glfwGetPrimaryMonitor()); // Valid on GLFW 3.3+ only
+  window = glfwCreateWindow((int)(1280 * main_scale), (int)(800 * main_scale), "Dear ImGui GLFW+OpenGL3 example", NULL, NULL);
 
-  window = glfwCreateWindow(1024, 768, "Hello World!", NULL, NULL);
   if (!window) 
   {
     printf("Failed to create window! Terminating!\n");
@@ -72,6 +73,15 @@ int main(int argc, char *argv[])
   ioptr->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;     // Enable Multi-Viewport / Platform Windows
 #endif
 
+
+    // Setup scaling
+    ImGuiStyle* style = igGetStyle();
+    ImGuiStyle_ScaleAllSizes(style, main_scale);        // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this requires resetting Style + calling this again)
+    style->FontScaleDpi = main_scale;        // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave both here for documentation purpose)
+#if GLFW_VERSION_MAJOR >= 3 && GLFW_VERSION_MINOR >= 3
+    ioptr->ConfigDpiScaleFonts = true;          // [Experimental] Automatically overwrite style.FontScaleDpi in Begin() when Monitor DPI changes. This will scale fonts but _NOT_ scale sizes/padding for now.
+    ioptr->ConfigDpiScaleViewports = true;      // [Experimental] Scale Dear ImGui and Platform Windows when Monitor DPI changes.
+#endif
   ImGui_ImplGlfw_InitForOpenGL(window, true);
   ImGui_ImplOpenGL3_Init(glsl_version);
 

backend_test/example_sdl3_vulkan/main.c

@@ -392,8 +392,9 @@ int main(int argc, char* argv[])
 #endif
 
     // Create window with Vulkan graphics context
-    SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WINDOW_HIDDEN);
+    float main_scale = SDL_GetDisplayContentScale(SDL_GetPrimaryDisplay());
-    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", 1280, 720, window_flags);
+    SDL_WindowFlags window_flags = SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
+    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL3+Vulkan example", (int)(1280 * main_scale), (int)(720 * main_scale), window_flags);
     if (window == NULL)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
@@ -451,6 +452,10 @@ int main(int argc, char* argv[])
 
     // When viewports are enabled we tweak WindowRounding/WindowBg so platform windows can look identical to regular ones.
     ImGuiStyle* style = igGetStyle();
+    ImGuiStyle_ScaleAllSizes(style, main_scale);        // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this requires resetting Style + calling this again)
+    style->FontScaleDpi = main_scale;        // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave both here for documentation purpose)
+    io->ConfigDpiScaleFonts = true;          // [Experimental] Automatically overwrite style.FontScaleDpi in Begin() when Monitor DPI changes. This will scale fonts but _NOT_ scale sizes/padding for now.
+    io->ConfigDpiScaleViewports = true;      // [Experimental] Scale Dear ImGui and Platform Windows when Monitor DPI changes.
     if (io->ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
     {
         style->WindowRounding = 0.0f;

backend_test/example_sdl_opengl3/main.c

@@ -10,6 +10,10 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
+#ifdef _WIN32
+#include <windows.h>        // SetProcessDPIAware()
+#endif
+
 #ifdef IMGUI_HAS_IMSTR
 #define igBegin igBegin_Str
 #define igSliderFloat igSliderFloat_Str
@@ -24,6 +28,9 @@ SDL_Window *window = NULL;
 
 int main(int argc, char* argv[])
 {
+#ifdef _WIN32
+    SetProcessDPIAware();
+#endif
 
   if (SDL_Init(SDL_INIT_VIDEO) < 0) {
     SDL_Log("failed to init: %s", SDL_GetError());
@@ -54,11 +61,10 @@ int main(int argc, char* argv[])
   SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
   SDL_DisplayMode current;
   SDL_GetCurrentDisplayMode(0, &current);
+  float main_scale = ImGui_ImplSDL2_GetContentScaleForDisplay(0);
+  SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
+  window = SDL_CreateWindow("Dear ImGui SDL2+OpenGL3 example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, (int)(1280 * main_scale), (int)(720 * main_scale), window_flags);
  
-  window = SDL_CreateWindow(
-      "Hello", 0, 0, 1024, 768,
-      SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE
-      );
   if (window == NULL) {
     SDL_Log("Failed to create window: %s", SDL_GetError());
     return -1;
@@ -83,6 +89,14 @@ int main(int argc, char* argv[])
   ioptr->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;         // Enable Multi-Viewport / Platform Windows
 #endif
   
+    // Setup scaling
+    ImGuiStyle* style = igGetStyle();
+    ImGuiStyle_ScaleAllSizes(style, main_scale);        // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this requires resetting Style + calling this again)
+    style->FontScaleDpi = main_scale;        // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave both here for documentation purpose)
+    ioptr->ConfigDpiScaleFonts = true;          // [Experimental] Automatically overwrite style.FontScaleDpi in Begin() when Monitor DPI changes. This will scale fonts but _NOT_ scale sizes/padding for now.
+    ioptr->ConfigDpiScaleViewports = true;      // [Experimental] Scale Dear ImGui and Platform Windows when Monitor DPI changes.
+
+
   ImGui_ImplSDL2_InitForOpenGL(window, gl_context);
   ImGui_ImplOpenGL3_Init(glsl_version);
 

backend_test/example_sdl_vulkan/main.c

@@ -11,6 +11,10 @@
 #include <volk.h>
 #endif
 
+#ifdef _WIN32
+#include <windows.h>        // SetProcessDPIAware()
+#endif
+
 //this must be equal to that in imgui_impl_vulkan.h
 #define IMGUI_IMPL_VULKAN_MINIMUM_IMAGE_SAMPLER_POOL_SIZE   (1)     // Minimum per atlas
 
@@ -376,6 +380,9 @@ static void FramePresent(ImGui_ImplVulkanH_Window* wd)
 // Main code
 int main(int argc, char* argv[])
 {
+#ifdef _WIN32
+    SetProcessDPIAware();
+#endif
     //g_MainWindowData.ClearEnable = true;
 	//ImGui_ImplVulkanH_Window_Construct(&g_MainWindowData);
 	g_MainWindowData = *ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window();
@@ -391,9 +398,10 @@ int main(int argc, char* argv[])
     SDL_SetHint(SDL_HINT_IME_SHOW_UI, "1");
 #endif
 
-    // Create window with Vulkan graphics context
+    float main_scale = ImGui_ImplSDL2_GetContentScaleForDisplay(0);
     SDL_WindowFlags window_flags = (SDL_WindowFlags)(SDL_WINDOW_VULKAN | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
-    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL2+Vulkan example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
+    SDL_Window* window = SDL_CreateWindow("Dear ImGui SDL2+Vulkan example", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, (int)(1280 * main_scale), (int)(720 * main_scale), window_flags);
+    
     if (window == NULL)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
@@ -445,6 +453,10 @@ int main(int argc, char* argv[])
         style->Colors[ImGuiCol_WindowBg].w = 1.0f;
     }
 
+    // Setup scaling
+    ImGuiStyle_ScaleAllSizes(style, main_scale);        // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this requires resetting Style + calling this again)
+    style->FontScaleDpi = main_scale;        // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave both here for documentation purpose)
+
     // Setup Platform/Renderer backends
     ImGui_ImplSDL2_InitForVulkan(window);
     ImGui_ImplVulkan_InitInfo init_info = {};

backend_test/example_sdlgpu3/main.c

@@ -13,18 +13,22 @@
 #define igGetIO igGetIO_Nil
 
 int main() {
-    if (!SDL_Init(SDL_INIT_VIDEO)) {
+    if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
       fprintf(stderr, "Failed to init video! %s", SDL_GetError());
       return 1;
     };
     
-    SDL_Window *window = NULL;
+    float main_scale = SDL_GetDisplayContentScale(SDL_GetPrimaryDisplay());
-    window = SDL_CreateWindow("cimgui SDL3+SDL_GPU example", 1280, 720, SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY);
+    SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
+    SDL_Window* window = NULL;
+    window = SDL_CreateWindow("Dear ImGui SDL3+SDL_GPU example", (int)(1280 * main_scale), (int)(720 * main_scale), window_flags);
     if (window == NULL)
     {
         printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
         return -1;
     }
+    SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
+    SDL_ShowWindow(window);
 
     // Create GPU Device
     SDL_GPUDevice* gpu_device = SDL_CreateGPUDevice(SDL_GPU_SHADERFORMAT_SPIRV | SDL_GPU_SHADERFORMAT_DXIL | SDL_GPU_SHADERFORMAT_METALLIB,true,NULL);
@@ -52,6 +56,12 @@ int main() {
     // Setup Dear ImGui style
     igStyleColorsDark(NULL);
     //igStyleColorsLight(NULL);
+    // Setup scaling
+    ImGuiStyle* style = igGetStyle();
+    ImGuiStyle_ScaleAllSizes(style, main_scale);        // Bake a fixed style scale. (until we have a solution for dynamic style scaling, changing this requires resetting Style + calling this again)
+    style->FontScaleDpi = main_scale;        // Set initial font scale. (using io.ConfigDpiScaleFonts=true makes this unnecessary. We leave both here for documentation purpose)
+    io->ConfigDpiScaleFonts = true;          // [Experimental] Automatically overwrite style.FontScaleDpi in Begin() when Monitor DPI changes. This will scale fonts but _NOT_ scale sizes/padding for now.
+    io->ConfigDpiScaleViewports = true;      // [Experimental] Scale Dear ImGui and Platform Windows when Monitor DPI changes.
 
     // Setup Platform/Renderer backends
     ImGui_ImplSDL3_InitForSDLGPU(window);
@@ -158,7 +168,7 @@ int main() {
         if (swapchain_texture != NULL && !is_minimized)
         {
             // This is mandatory: call Imgui_ImplSDLGPU3_PrepareDrawData() to upload the vertex/index buffer!
-            Imgui_ImplSDLGPU3_PrepareDrawData(draw_data, command_buffer);
+            ImGui_ImplSDLGPU3_PrepareDrawData(draw_data, command_buffer);
 
             // Setup and start a render pass
             SDL_GPUColorTargetInfo target_info ;//= {};

cimgui.cpp

@@ -1,13 +1,10 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.92.0" 19200 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.92.1" 19210 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
 //docking branch
 
 #include "./imgui/imgui.h"
-#ifdef IMGUI_ENABLE_FREETYPE
-#include "./imgui/misc/freetype/imgui_freetype.h"
-#endif
 #include "./imgui/imgui_internal.h"
 #include "cimgui.h"
 
@@ -2779,6 +2776,10 @@ CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self)
 {
     return self->CompactCache();
 }
+CIMGUI_API void ImFontAtlas_SetFontLoader(ImFontAtlas* self,const ImFontLoader* font_loader)
+{
+    return self->SetFontLoader(font_loader);
+}
 CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self)
 {
     return self->ClearInputData();
@@ -6159,6 +6160,10 @@ CIMGUI_API ImFontGlyph* igImFontAtlasBakedAddFontGlyph(ImFontAtlas* atlas,ImFont
 {
     return ImFontAtlasBakedAddFontGlyph(atlas,baked,src,in_glyph);
 }
+CIMGUI_API void igImFontAtlasBakedAddFontGlyphAdvancedX(ImFontAtlas* atlas,ImFontBaked* baked,ImFontConfig* src,ImWchar codepoint,float advance_x)
+{
+    return ImFontAtlasBakedAddFontGlyphAdvancedX(atlas,baked,src,codepoint,advance_x);
+}
 CIMGUI_API void igImFontAtlasBakedDiscardFontGlyph(ImFontAtlas* atlas,ImFont* font,ImFontBaked* baked,ImFontGlyph* glyph)
 {
     return ImFontAtlasBakedDiscardFontGlyph(atlas,font,baked,glyph);

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.92.0" 19200 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.92.1" 19210 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
 //docking branch
@@ -39,6 +39,12 @@ typedef unsigned __int64 ImU64;
 //typedef unsigned long long ImU64;
 #endif
 
+#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+#ifdef IMGUI_ENABLE_FREETYPE
+#include "./imgui/misc/freetype/imgui_freetype.h"
+#endif
+#endif
+
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 
@@ -1503,9 +1509,9 @@ struct ImFontConfig
     bool MergeMode;
     bool PixelSnapH;
     bool PixelSnapV;
-    ImS8 FontNo;
     ImS8 OversampleH;
     ImS8 OversampleV;
+    ImWchar EllipsisChar;
     float SizePixels;
     const ImWchar* GlyphRanges;
     const ImWchar* GlyphExcludeRanges;
@@ -1513,10 +1519,10 @@ struct ImFontConfig
     float GlyphMinAdvanceX;
     float GlyphMaxAdvanceX;
     float GlyphExtraAdvanceX;
+    ImU32 FontNo;
     unsigned int FontLoaderFlags;
     float RasterizerMultiply;
     float RasterizerDensity;
-    ImWchar EllipsisChar;
     ImFontFlags Flags;
     ImFont* DstFont;
     const ImFontLoader* FontLoader;
@@ -2937,7 +2943,7 @@ struct ImGuiContext
     float WheelingWindowReleaseTimer;
     ImVec2 WheelingWindowWheelRemainder;
     ImVec2 WheelingAxisAvg;
-    ImGuiID DebugDrawIdConflicts;
+    ImGuiID DebugDrawIdConflictsId;
     ImGuiID DebugHookIdInfo;
     ImGuiID HoveredId;
     ImGuiID HoveredIdPreviousFrame;
@@ -3683,7 +3689,7 @@ struct ImFontLoader
     bool (*FontSrcContainsGlyph)(ImFontAtlas* atlas, ImFontConfig* src, ImWchar codepoint);
     bool (*FontBakedInit)(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src);
     void (*FontBakedDestroy)(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src);
-    bool (*FontBakedLoadGlyph)(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src, ImWchar codepoint, ImFontGlyph* out_glyph);
+    bool (*FontBakedLoadGlyph)(ImFontAtlas* atlas, ImFontConfig* src, ImFontBaked* baked, void* loader_data_for_baked_src, ImWchar codepoint, ImFontGlyph* out_glyph, float* out_advance_x);
     size_t FontBakedSrcLoaderDataSize;
 };
 struct ImFontAtlasRectEntry
@@ -4546,6 +4552,7 @@ CIMGUI_API ImFont* ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(ImFontAtlas*
 CIMGUI_API void ImFontAtlas_RemoveFont(ImFontAtlas* self,ImFont* font);
 CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self);
+CIMGUI_API void ImFontAtlas_SetFontLoader(ImFontAtlas* self,const ImFontLoader* font_loader);
 CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self);
@@ -5393,6 +5400,7 @@ CIMGUI_API ImFontBaked* igImFontAtlasBakedGetClosestMatch(ImFontAtlas* atlas,ImF
 CIMGUI_API ImFontBaked* igImFontAtlasBakedAdd(ImFontAtlas* atlas,ImFont* font,float font_size,float font_rasterizer_density,ImGuiID baked_id);
 CIMGUI_API void igImFontAtlasBakedDiscard(ImFontAtlas* atlas,ImFont* font,ImFontBaked* baked);
 CIMGUI_API ImFontGlyph* igImFontAtlasBakedAddFontGlyph(ImFontAtlas* atlas,ImFontBaked* baked,ImFontConfig* src,const ImFontGlyph* in_glyph);
+CIMGUI_API void igImFontAtlasBakedAddFontGlyphAdvancedX(ImFontAtlas* atlas,ImFontBaked* baked,ImFontConfig* src,ImWchar codepoint,float advance_x);
 CIMGUI_API void igImFontAtlasBakedDiscardFontGlyph(ImFontAtlas* atlas,ImFont* font,ImFontBaked* baked,ImFontGlyph* glyph);
 CIMGUI_API void igImFontAtlasBakedSetFontGlyphBitmap(ImFontAtlas* atlas,ImFontBaked* baked,ImFontConfig* src,ImFontGlyph* glyph,ImTextureRect* r,const unsigned char* src_pixels,ImTextureFormat src_fmt,int src_pitch);
 CIMGUI_API void igImFontAtlasPackInit(ImFontAtlas* atlas);

generator/cimgui_template.cpp

@@ -1,8 +1,5 @@
 
 #include "./imgui/imgui.h"
-#ifdef IMGUI_ENABLE_FREETYPE
-#include "./imgui/misc/freetype/imgui_freetype.h"
-#endif
 #include "./imgui/imgui_internal.h"
 #include "cimgui.h"
 

generator/cimgui_template.h

@@ -34,6 +34,12 @@ typedef unsigned __int64 ImU64;
 //typedef unsigned long long ImU64;
 #endif
 
+#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
+#ifdef IMGUI_ENABLE_FREETYPE
+#include "./imgui/misc/freetype/imgui_freetype.h"
+#endif
+#endif
+
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 #include "imgui_structs.h"

generator/cpp2ffi.lua

@@ -1475,6 +1475,8 @@ function M.Parser()
 				txt = txt:gsub(k,v)
 			end
 		end
+		--clean = default in constructor (implot3d)
+		txt = txt:gsub("=%s*default","")
 		--save_data("./preprocode"..tostring(self):gsub("table: ","")..".c",txt)
 		--clean bad positioned comments inside functionD_re
 		if self.COMMENTS_GENERATION then
@@ -1557,6 +1559,7 @@ function M.Parser()
 		local inistruct = clean_spaces(stru:match("(.-)%b{}"))
 		--clean final:
 		inistruct = inistruct:gsub("%s*final%s*:",":")
+
 		--local stname = stru:match("struct%s*(%S+)%s*%b{}")
 		local stname, derived
 		if inistruct:match":" then

generator/output/structs_and_enums.json

@@ -5287,204 +5287,204 @@
     "ImDrawListSharedData": "imgui_internal:848",
     "ImDrawListSplitter": "imgui:3266",
     "ImDrawVert": "imgui:3235",
-    "ImFont": "imgui:3894",
+    "ImFont": "imgui:3897",
-    "ImFontAtlas": "imgui:3699",
+    "ImFontAtlas": "imgui:3701",
-    "ImFontAtlasBuilder": "imgui_internal:4065",
+    "ImFontAtlasBuilder": "imgui_internal:4077",
-    "ImFontAtlasFlags_": "imgui:3672",
+    "ImFontAtlasFlags_": "imgui:3674",
-    "ImFontAtlasPostProcessData": "imgui_internal:4038",
+    "ImFontAtlasPostProcessData": "imgui_internal:4050",
-    "ImFontAtlasRect": "imgui:3662",
+    "ImFontAtlasRect": "imgui:3664",
-    "ImFontAtlasRectEntry": "imgui_internal:4030",
+    "ImFontAtlasRectEntry": "imgui_internal:4042",
-    "ImFontBaked": "imgui:3847",
+    "ImFontBaked": "imgui:3850",
-    "ImFontConfig": "imgui:3584",
+    "ImFontConfig": "imgui:3586",
-    "ImFontFlags_": "imgui:3881",
+    "ImFontFlags_": "imgui:3884",
-    "ImFontGlyph": "imgui:3624",
+    "ImFontGlyph": "imgui:3626",
-    "ImFontGlyphRangesBuilder": "imgui:3640",
+    "ImFontGlyphRangesBuilder": "imgui:3642",
-    "ImFontLoader": "imgui_internal:3982",
+    "ImFontLoader": "imgui_internal:3991",
     "ImFontStackData": "imgui_internal:883",
-    "ImGuiActivateFlags_": "imgui_internal:1667",
+    "ImGuiActivateFlags_": "imgui_internal:1669",
-    "ImGuiAxis": "imgui_internal:1132",
+    "ImGuiAxis": "imgui_internal:1134",
     "ImGuiBackendFlags_": "imgui:1756",
-    "ImGuiBoxSelectState": "imgui_internal:1856",
+    "ImGuiBoxSelectState": "imgui_internal:1859",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:1019",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:1020",
     "ImGuiButtonFlags_": "imgui:1896",
     "ImGuiChildFlags_": "imgui:1230",
     "ImGuiCol_": "imgui:1772",
     "ImGuiColorEditFlags_": "imgui:1907",
     "ImGuiColorMod": "imgui_internal:903",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:1045",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:1047",
     "ImGuiComboFlags_": "imgui:1385",
-    "ImGuiComboPreviewData": "imgui_internal:1146",
+    "ImGuiComboPreviewData": "imgui_internal:1148",
     "ImGuiCond_": "imgui:2021",
     "ImGuiConfigFlags_": "imgui:1727",
-    "ImGuiContext": "imgui_internal:2329",
+    "ImGuiContext": "imgui_internal:2332",
-    "ImGuiContextHook": "imgui_internal:2314",
+    "ImGuiContextHook": "imgui_internal:2317",
-    "ImGuiContextHookType": "imgui_internal:2312",
+    "ImGuiContextHookType": "imgui_internal:2315",
-    "ImGuiDataAuthority_": "imgui_internal:1969",
+    "ImGuiDataAuthority_": "imgui_internal:1972",
     "ImGuiDataTypeInfo": "imgui_internal:929",
     "ImGuiDataTypePrivate_": "imgui_internal:938",
     "ImGuiDataTypeStorage": "imgui_internal:923",
     "ImGuiDataType_": "imgui:1533",
-    "ImGuiDeactivatedItemData": "imgui_internal:1432",
+    "ImGuiDeactivatedItemData": "imgui_internal:1434",
-    "ImGuiDebugAllocEntry": "imgui_internal:2246",
+    "ImGuiDebugAllocEntry": "imgui_internal:2249",
-    "ImGuiDebugAllocInfo": "imgui_internal:2253",
+    "ImGuiDebugAllocInfo": "imgui_internal:2256",
-    "ImGuiDebugLogFlags_": "imgui_internal:2224",
+    "ImGuiDebugLogFlags_": "imgui_internal:2227",
     "ImGuiDir": "imgui:1551",
-    "ImGuiDockContext": "imgui_internal:2071",
+    "ImGuiDockContext": "imgui_internal:2074",
-    "ImGuiDockNode": "imgui_internal:1985",
+    "ImGuiDockNode": "imgui_internal:1988",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1937",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1940",
     "ImGuiDockNodeFlags_": "imgui:1486",
-    "ImGuiDockNodeState": "imgui_internal:1976",
+    "ImGuiDockNodeState": "imgui_internal:1979",
     "ImGuiDragDropFlags_": "imgui:1505",
-    "ImGuiErrorRecoveryState": "imgui_internal:1388",
+    "ImGuiErrorRecoveryState": "imgui_internal:1390",
-    "ImGuiFocusRequestFlags_": "imgui_internal:1092",
+    "ImGuiFocusRequestFlags_": "imgui_internal:1094",
-    "ImGuiFocusScopeData": "imgui_internal:1753",
+    "ImGuiFocusScopeData": "imgui_internal:1756",
     "ImGuiFocusedFlags_": "imgui:1432",
     "ImGuiFreeTypeLoaderFlags_": "imgui_freetype:29",
-    "ImGuiGroupData": "imgui_internal:1159",
+    "ImGuiGroupData": "imgui_internal:1161",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1002",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:1003",
     "ImGuiHoveredFlags_": "imgui:1446",
-    "ImGuiIDStackTool": "imgui_internal:2294",
+    "ImGuiIDStackTool": "imgui_internal:2297",
     "ImGuiIO": "imgui:2418",
-    "ImGuiInputEvent": "imgui_internal:1527",
+    "ImGuiInputEvent": "imgui_internal:1529",
-    "ImGuiInputEventAppFocused": "imgui_internal:1525",
+    "ImGuiInputEventAppFocused": "imgui_internal:1527",
-    "ImGuiInputEventKey": "imgui_internal:1523",
+    "ImGuiInputEventKey": "imgui_internal:1525",
-    "ImGuiInputEventMouseButton": "imgui_internal:1521",
+    "ImGuiInputEventMouseButton": "imgui_internal:1523",
-    "ImGuiInputEventMousePos": "imgui_internal:1519",
+    "ImGuiInputEventMousePos": "imgui_internal:1521",
-    "ImGuiInputEventMouseViewport": "imgui_internal:1522",
+    "ImGuiInputEventMouseViewport": "imgui_internal:1524",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1520",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1522",
-    "ImGuiInputEventText": "imgui_internal:1524",
+    "ImGuiInputEventText": "imgui_internal:1526",
-    "ImGuiInputEventType": "imgui_internal:1495",
+    "ImGuiInputEventType": "imgui_internal:1497",
-    "ImGuiInputFlagsPrivate_": "imgui_internal:1594",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1596",
     "ImGuiInputFlags_": "imgui:1704",
-    "ImGuiInputSource": "imgui_internal:1508",
+    "ImGuiInputSource": "imgui_internal:1510",
     "ImGuiInputTextCallbackData": "imgui:2680",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1195",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1197",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1010",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:1011",
     "ImGuiInputTextFlags_": "imgui:1264",
-    "ImGuiInputTextState": "imgui_internal:1217",
+    "ImGuiInputTextState": "imgui_internal:1219",
     "ImGuiItemFlagsPrivate_": "imgui_internal:951",
     "ImGuiItemFlags_": "imgui:1251",
     "ImGuiItemStatusFlags_": "imgui_internal:976",
     "ImGuiKey": "imgui:1575",
     "ImGuiKeyData": "imgui:2410",
-    "ImGuiKeyOwnerData": "imgui_internal:1581",
+    "ImGuiKeyOwnerData": "imgui_internal:1583",
-    "ImGuiKeyRoutingData": "imgui_internal:1555",
+    "ImGuiKeyRoutingData": "imgui_internal:1557",
-    "ImGuiKeyRoutingTable": "imgui_internal:1569",
+    "ImGuiKeyRoutingTable": "imgui_internal:1571",
-    "ImGuiLastItemData": "imgui_internal:1357",
+    "ImGuiLastItemData": "imgui_internal:1359",
-    "ImGuiLayoutType_": "imgui_internal:1113",
+    "ImGuiLayoutType_": "imgui_internal:1115",
     "ImGuiListClipper": "imgui:2910",
-    "ImGuiListClipperData": "imgui_internal:1651",
+    "ImGuiListClipperData": "imgui_internal:1653",
-    "ImGuiListClipperRange": "imgui_internal:1638",
+    "ImGuiListClipperRange": "imgui_internal:1640",
-    "ImGuiLocEntry": "imgui_internal:2197",
+    "ImGuiLocEntry": "imgui_internal:2200",
-    "ImGuiLocKey": "imgui_internal:2179",
+    "ImGuiLocKey": "imgui_internal:2182",
-    "ImGuiLogFlags_": "imgui_internal:1120",
+    "ImGuiLogFlags_": "imgui_internal:1122",
-    "ImGuiMenuColumns": "imgui_internal:1177",
+    "ImGuiMenuColumns": "imgui_internal:1179",
-    "ImGuiMetricsConfig": "imgui_internal:2263",
+    "ImGuiMetricsConfig": "imgui_internal:2266",
     "ImGuiMouseButton_": "imgui:1979",
     "ImGuiMouseCursor_": "imgui:1989",
     "ImGuiMouseSource": "imgui:2010",
     "ImGuiMultiSelectFlags_": "imgui:3068",
     "ImGuiMultiSelectIO": "imgui:3095",
-    "ImGuiMultiSelectState": "imgui_internal:1913",
+    "ImGuiMultiSelectState": "imgui_internal:1916",
-    "ImGuiMultiSelectTempData": "imgui_internal:1888",
+    "ImGuiMultiSelectTempData": "imgui_internal:1891",
-    "ImGuiNavItemData": "imgui_internal:1736",
+    "ImGuiNavItemData": "imgui_internal:1739",
-    "ImGuiNavLayer": "imgui_internal:1728",
+    "ImGuiNavLayer": "imgui_internal:1731",
-    "ImGuiNavMoveFlags_": "imgui_internal:1706",
+    "ImGuiNavMoveFlags_": "imgui_internal:1709",
-    "ImGuiNavRenderCursorFlags_": "imgui_internal:1692",
+    "ImGuiNavRenderCursorFlags_": "imgui_internal:1694",
-    "ImGuiNextItemData": "imgui_internal:1336",
+    "ImGuiNextItemData": "imgui_internal:1338",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1326",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1328",
-    "ImGuiNextWindowData": "imgui_internal:1294",
+    "ImGuiNextWindowData": "imgui_internal:1296",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1274",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1276",
-    "ImGuiOldColumnData": "imgui_internal:1821",
+    "ImGuiOldColumnData": "imgui_internal:1824",
-    "ImGuiOldColumnFlags_": "imgui_internal:1801",
+    "ImGuiOldColumnFlags_": "imgui_internal:1804",
-    "ImGuiOldColumns": "imgui_internal:1831",
+    "ImGuiOldColumns": "imgui_internal:1834",
     "ImGuiOnceUponAFrame": "imgui:2780",
     "ImGuiPayload": "imgui:2745",
-    "ImGuiPlatformIO": "imgui:4078",
+    "ImGuiPlatformIO": "imgui:4081",
-    "ImGuiPlatformImeData": "imgui:4193",
+    "ImGuiPlatformImeData": "imgui:4196",
-    "ImGuiPlatformMonitor": "imgui:4183",
+    "ImGuiPlatformMonitor": "imgui:4186",
-    "ImGuiPlotType": "imgui_internal:1139",
+    "ImGuiPlotType": "imgui_internal:1141",
-    "ImGuiPopupData": "imgui_internal:1452",
+    "ImGuiPopupData": "imgui_internal:1454",
     "ImGuiPopupFlags_": "imgui:1350",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1444",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1446",
-    "ImGuiPtrOrIndex": "imgui_internal:1422",
+    "ImGuiPtrOrIndex": "imgui_internal:1424",
-    "ImGuiScrollFlags_": "imgui_internal:1678",
+    "ImGuiScrollFlags_": "imgui_internal:1680",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1058",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:1060",
     "ImGuiSelectableFlags_": "imgui:1368",
     "ImGuiSelectionBasicStorage": "imgui:3141",
     "ImGuiSelectionExternalStorage": "imgui:3164",
     "ImGuiSelectionRequest": "imgui:3115",
     "ImGuiSelectionRequestType": "imgui:3107",
-    "ImGuiSeparatorFlags_": "imgui_internal:1081",
+    "ImGuiSeparatorFlags_": "imgui_internal:1083",
-    "ImGuiSettingsHandler": "imgui_internal:2159",
+    "ImGuiSettingsHandler": "imgui_internal:2162",
-    "ImGuiShrinkWidthItem": "imgui_internal:1415",
+    "ImGuiShrinkWidthItem": "imgui_internal:1417",
     "ImGuiSizeCallbackData": "imgui:2714",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:1051",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:1053",
     "ImGuiSliderFlags_": "imgui:1963",
     "ImGuiSortDirection": "imgui:1562",
-    "ImGuiStackLevelInfo": "imgui_internal:2282",
+    "ImGuiStackLevelInfo": "imgui_internal:2285",
     "ImGuiStorage": "imgui:2853",
     "ImGuiStoragePair": "imgui:2836",
     "ImGuiStyle": "imgui:2308",
     "ImGuiStyleMod": "imgui_internal:910",
     "ImGuiStyleVarInfo": "imgui_internal:894",
     "ImGuiStyleVar_": "imgui:1852",
-    "ImGuiTabBar": "imgui_internal:2974",
+    "ImGuiTabBar": "imgui_internal:2982",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2936",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2944",
     "ImGuiTabBarFlags_": "imgui:1400",
-    "ImGuiTabItem": "imgui_internal:2954",
+    "ImGuiTabItem": "imgui_internal:2962",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2944",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2952",
     "ImGuiTabItemFlags_": "imgui:1417",
-    "ImGuiTable": "imgui_internal:3117",
+    "ImGuiTable": "imgui_internal:3125",
     "ImGuiTableBgTarget_": "imgui:2162",
-    "ImGuiTableCellData": "imgui_internal:3085",
+    "ImGuiTableCellData": "imgui_internal:3093",
-    "ImGuiTableColumn": "imgui_internal:3025",
+    "ImGuiTableColumn": "imgui_internal:3033",
     "ImGuiTableColumnFlags_": "imgui:2109",
-    "ImGuiTableColumnSettings": "imgui_internal:3265",
+    "ImGuiTableColumnSettings": "imgui_internal:3273",
     "ImGuiTableColumnSortSpecs": "imgui:2184",
     "ImGuiTableFlags_": "imgui:2056",
-    "ImGuiTableHeaderData": "imgui_internal:3094",
+    "ImGuiTableHeaderData": "imgui_internal:3102",
-    "ImGuiTableInstanceData": "imgui_internal:3104",
+    "ImGuiTableInstanceData": "imgui_internal:3112",
     "ImGuiTableRowFlags_": "imgui:2147",
-    "ImGuiTableSettings": "imgui_internal:3289",
+    "ImGuiTableSettings": "imgui_internal:3297",
     "ImGuiTableSortSpecs": "imgui:2174",
-    "ImGuiTableTempData": "imgui_internal:3242",
+    "ImGuiTableTempData": "imgui_internal:3250",
     "ImGuiTextBuffer": "imgui:2815",
     "ImGuiTextFilter": "imgui:2788",
-    "ImGuiTextFlags_": "imgui_internal:1099",
+    "ImGuiTextFlags_": "imgui_internal:1101",
     "ImGuiTextIndex": "imgui_internal:800",
     "ImGuiTextRange": "imgui:2798",
-    "ImGuiTooltipFlags_": "imgui_internal:1105",
+    "ImGuiTooltipFlags_": "imgui_internal:1107",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1072",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1074",
     "ImGuiTreeNodeFlags_": "imgui:1306",
-    "ImGuiTreeNodeStackData": "imgui_internal:1376",
+    "ImGuiTreeNodeStackData": "imgui_internal:1378",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1764",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1767",
-    "ImGuiTypingSelectRequest": "imgui_internal:1772",
+    "ImGuiTypingSelectRequest": "imgui_internal:1775",
-    "ImGuiTypingSelectState": "imgui_internal:1783",
+    "ImGuiTypingSelectState": "imgui_internal:1786",
-    "ImGuiViewport": "imgui:3992",
+    "ImGuiViewport": "imgui:3995",
-    "ImGuiViewportFlags_": "imgui:3964",
+    "ImGuiViewportFlags_": "imgui:3967",
-    "ImGuiViewportP": "imgui_internal:2088",
+    "ImGuiViewportP": "imgui_internal:2091",
-    "ImGuiWindow": "imgui_internal:2781",
+    "ImGuiWindow": "imgui_internal:2789",
     "ImGuiWindowClass": "imgui:2729",
-    "ImGuiWindowDockStyle": "imgui_internal:2066",
+    "ImGuiWindowDockStyle": "imgui_internal:2069",
-    "ImGuiWindowDockStyleCol": "imgui_internal:2052",
+    "ImGuiWindowDockStyleCol": "imgui_internal:2055",
     "ImGuiWindowFlags_": "imgui:1179",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1265",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1267",
-    "ImGuiWindowSettings": "imgui_internal:2140",
+    "ImGuiWindowSettings": "imgui_internal:2143",
-    "ImGuiWindowStackData": "imgui_internal:1406",
+    "ImGuiWindowStackData": "imgui_internal:1408",
-    "ImGuiWindowTempData": "imgui_internal:2724",
+    "ImGuiWindowTempData": "imgui_internal:2732",
     "ImRect": "imgui_internal:569",
-    "ImTextureData": "imgui:3542",
+    "ImTextureData": "imgui:3544",
-    "ImTextureFormat": "imgui:3510",
+    "ImTextureFormat": "imgui:3512",
-    "ImTextureRect": "imgui:3529",
+    "ImTextureRect": "imgui:3531",
     "ImTextureRef": "imgui:360",
-    "ImTextureStatus": "imgui:3517",
+    "ImTextureStatus": "imgui:3519",
     "ImVec1": "imgui_internal:543",
     "ImVec2": "imgui:292",
     "ImVec2i": "imgui_internal:551",
     "ImVec2ih": "imgui_internal:559",
     "ImVec4": "imgui:305",
-    "stbrp_context_opaque": "imgui_internal:4062"
+    "stbrp_context_opaque": "imgui_internal:4074"
   },
   "nonPOD": {
     "ImBitArray": true,
@@ -6343,10 +6343,6 @@
         "name": "PixelSnapV",
         "type": "bool"
       },
-      {
-        "name": "FontNo",
-        "type": "ImS8"
-      },
       {
         "name": "OversampleH",
         "type": "ImS8"
@@ -6355,6 +6351,10 @@
         "name": "OversampleV",
         "type": "ImS8"
       },
+      {
+        "name": "EllipsisChar",
+        "type": "ImWchar"
+      },
       {
         "name": "SizePixels",
         "type": "float"
@@ -6383,6 +6383,10 @@
         "name": "GlyphExtraAdvanceX",
         "type": "float"
       },
+      {
+        "name": "FontNo",
+        "type": "ImU32"
+      },
       {
         "name": "FontLoaderFlags",
         "type": "unsigned int"
@@ -6395,10 +6399,6 @@
         "name": "RasterizerDensity",
         "type": "float"
       },
-      {
-        "name": "EllipsisChar",
-        "type": "ImWchar"
-      },
       {
         "name": "Flags",
         "type": "ImFontFlags"
@@ -6520,7 +6520,7 @@
       },
       {
         "name": "FontBakedLoadGlyph",
-        "type": "bool(*)(ImFontAtlas* atlas,ImFontConfig* src,ImFontBaked* baked,void* loader_data_for_baked_src,ImWchar codepoint,ImFontGlyph* out_glyph)"
+        "type": "bool(*)(ImFontAtlas* atlas,ImFontConfig* src,ImFontBaked* baked,void* loader_data_for_baked_src,ImWchar codepoint,ImFontGlyph* out_glyph,float* out_advance_x)"
       },
       {
         "name": "FontBakedSrcLoaderDataSize",
@@ -6854,7 +6854,7 @@
         "type": "ImVec2"
       },
       {
-        "name": "DebugDrawIdConflicts",
+        "name": "DebugDrawIdConflictsId",
         "type": "ImGuiID"
       },
       {

generator/output/structs_and_enums.lua

@@ -4181,204 +4181,204 @@ local t={
     ImDrawListSharedData="imgui_internal:848",
     ImDrawListSplitter="imgui:3266",
     ImDrawVert="imgui:3235",
-    ImFont="imgui:3894",
+    ImFont="imgui:3897",
-    ImFontAtlas="imgui:3699",
+    ImFontAtlas="imgui:3701",
-    ImFontAtlasBuilder="imgui_internal:4065",
+    ImFontAtlasBuilder="imgui_internal:4077",
-    ImFontAtlasFlags_="imgui:3672",
+    ImFontAtlasFlags_="imgui:3674",
-    ImFontAtlasPostProcessData="imgui_internal:4038",
+    ImFontAtlasPostProcessData="imgui_internal:4050",
-    ImFontAtlasRect="imgui:3662",
+    ImFontAtlasRect="imgui:3664",
-    ImFontAtlasRectEntry="imgui_internal:4030",
+    ImFontAtlasRectEntry="imgui_internal:4042",
-    ImFontBaked="imgui:3847",
+    ImFontBaked="imgui:3850",
-    ImFontConfig="imgui:3584",
+    ImFontConfig="imgui:3586",
-    ImFontFlags_="imgui:3881",
+    ImFontFlags_="imgui:3884",
-    ImFontGlyph="imgui:3624",
+    ImFontGlyph="imgui:3626",
-    ImFontGlyphRangesBuilder="imgui:3640",
+    ImFontGlyphRangesBuilder="imgui:3642",
-    ImFontLoader="imgui_internal:3982",
+    ImFontLoader="imgui_internal:3991",
     ImFontStackData="imgui_internal:883",
-    ImGuiActivateFlags_="imgui_internal:1667",
+    ImGuiActivateFlags_="imgui_internal:1669",
-    ImGuiAxis="imgui_internal:1132",
+    ImGuiAxis="imgui_internal:1134",
     ImGuiBackendFlags_="imgui:1756",
-    ImGuiBoxSelectState="imgui_internal:1856",
+    ImGuiBoxSelectState="imgui_internal:1859",
-    ImGuiButtonFlagsPrivate_="imgui_internal:1019",
+    ImGuiButtonFlagsPrivate_="imgui_internal:1020",
     ImGuiButtonFlags_="imgui:1896",
     ImGuiChildFlags_="imgui:1230",
     ImGuiCol_="imgui:1772",
     ImGuiColorEditFlags_="imgui:1907",
     ImGuiColorMod="imgui_internal:903",
-    ImGuiComboFlagsPrivate_="imgui_internal:1045",
+    ImGuiComboFlagsPrivate_="imgui_internal:1047",
     ImGuiComboFlags_="imgui:1385",
-    ImGuiComboPreviewData="imgui_internal:1146",
+    ImGuiComboPreviewData="imgui_internal:1148",
     ImGuiCond_="imgui:2021",
     ImGuiConfigFlags_="imgui:1727",
-    ImGuiContext="imgui_internal:2329",
+    ImGuiContext="imgui_internal:2332",
-    ImGuiContextHook="imgui_internal:2314",
+    ImGuiContextHook="imgui_internal:2317",
-    ImGuiContextHookType="imgui_internal:2312",
+    ImGuiContextHookType="imgui_internal:2315",
-    ImGuiDataAuthority_="imgui_internal:1969",
+    ImGuiDataAuthority_="imgui_internal:1972",
     ImGuiDataTypeInfo="imgui_internal:929",
     ImGuiDataTypePrivate_="imgui_internal:938",
     ImGuiDataTypeStorage="imgui_internal:923",
     ImGuiDataType_="imgui:1533",
-    ImGuiDeactivatedItemData="imgui_internal:1432",
+    ImGuiDeactivatedItemData="imgui_internal:1434",
-    ImGuiDebugAllocEntry="imgui_internal:2246",
+    ImGuiDebugAllocEntry="imgui_internal:2249",
-    ImGuiDebugAllocInfo="imgui_internal:2253",
+    ImGuiDebugAllocInfo="imgui_internal:2256",
-    ImGuiDebugLogFlags_="imgui_internal:2224",
+    ImGuiDebugLogFlags_="imgui_internal:2227",
     ImGuiDir="imgui:1551",
-    ImGuiDockContext="imgui_internal:2071",
+    ImGuiDockContext="imgui_internal:2074",
-    ImGuiDockNode="imgui_internal:1985",
+    ImGuiDockNode="imgui_internal:1988",
-    ImGuiDockNodeFlagsPrivate_="imgui_internal:1937",
+    ImGuiDockNodeFlagsPrivate_="imgui_internal:1940",
     ImGuiDockNodeFlags_="imgui:1486",
-    ImGuiDockNodeState="imgui_internal:1976",
+    ImGuiDockNodeState="imgui_internal:1979",
     ImGuiDragDropFlags_="imgui:1505",
-    ImGuiErrorRecoveryState="imgui_internal:1388",
+    ImGuiErrorRecoveryState="imgui_internal:1390",
-    ImGuiFocusRequestFlags_="imgui_internal:1092",
+    ImGuiFocusRequestFlags_="imgui_internal:1094",
-    ImGuiFocusScopeData="imgui_internal:1753",
+    ImGuiFocusScopeData="imgui_internal:1756",
     ImGuiFocusedFlags_="imgui:1432",
     ImGuiFreeTypeLoaderFlags_="imgui_freetype:29",
-    ImGuiGroupData="imgui_internal:1159",
+    ImGuiGroupData="imgui_internal:1161",
-    ImGuiHoveredFlagsPrivate_="imgui_internal:1002",
+    ImGuiHoveredFlagsPrivate_="imgui_internal:1003",
     ImGuiHoveredFlags_="imgui:1446",
-    ImGuiIDStackTool="imgui_internal:2294",
+    ImGuiIDStackTool="imgui_internal:2297",
     ImGuiIO="imgui:2418",
-    ImGuiInputEvent="imgui_internal:1527",
+    ImGuiInputEvent="imgui_internal:1529",
-    ImGuiInputEventAppFocused="imgui_internal:1525",
+    ImGuiInputEventAppFocused="imgui_internal:1527",
-    ImGuiInputEventKey="imgui_internal:1523",
+    ImGuiInputEventKey="imgui_internal:1525",
-    ImGuiInputEventMouseButton="imgui_internal:1521",
+    ImGuiInputEventMouseButton="imgui_internal:1523",
-    ImGuiInputEventMousePos="imgui_internal:1519",
+    ImGuiInputEventMousePos="imgui_internal:1521",
-    ImGuiInputEventMouseViewport="imgui_internal:1522",
+    ImGuiInputEventMouseViewport="imgui_internal:1524",
-    ImGuiInputEventMouseWheel="imgui_internal:1520",
+    ImGuiInputEventMouseWheel="imgui_internal:1522",
-    ImGuiInputEventText="imgui_internal:1524",
+    ImGuiInputEventText="imgui_internal:1526",
-    ImGuiInputEventType="imgui_internal:1495",
+    ImGuiInputEventType="imgui_internal:1497",
-    ImGuiInputFlagsPrivate_="imgui_internal:1594",
+    ImGuiInputFlagsPrivate_="imgui_internal:1596",
     ImGuiInputFlags_="imgui:1704",
-    ImGuiInputSource="imgui_internal:1508",
+    ImGuiInputSource="imgui_internal:1510",
     ImGuiInputTextCallbackData="imgui:2680",
-    ImGuiInputTextDeactivatedState="imgui_internal:1195",
+    ImGuiInputTextDeactivatedState="imgui_internal:1197",
-    ImGuiInputTextFlagsPrivate_="imgui_internal:1010",
+    ImGuiInputTextFlagsPrivate_="imgui_internal:1011",
     ImGuiInputTextFlags_="imgui:1264",
-    ImGuiInputTextState="imgui_internal:1217",
+    ImGuiInputTextState="imgui_internal:1219",
     ImGuiItemFlagsPrivate_="imgui_internal:951",
     ImGuiItemFlags_="imgui:1251",
     ImGuiItemStatusFlags_="imgui_internal:976",
     ImGuiKey="imgui:1575",
     ImGuiKeyData="imgui:2410",
-    ImGuiKeyOwnerData="imgui_internal:1581",
+    ImGuiKeyOwnerData="imgui_internal:1583",
-    ImGuiKeyRoutingData="imgui_internal:1555",
+    ImGuiKeyRoutingData="imgui_internal:1557",
-    ImGuiKeyRoutingTable="imgui_internal:1569",
+    ImGuiKeyRoutingTable="imgui_internal:1571",
-    ImGuiLastItemData="imgui_internal:1357",
+    ImGuiLastItemData="imgui_internal:1359",
-    ImGuiLayoutType_="imgui_internal:1113",
+    ImGuiLayoutType_="imgui_internal:1115",
     ImGuiListClipper="imgui:2910",
-    ImGuiListClipperData="imgui_internal:1651",
+    ImGuiListClipperData="imgui_internal:1653",
-    ImGuiListClipperRange="imgui_internal:1638",
+    ImGuiListClipperRange="imgui_internal:1640",
-    ImGuiLocEntry="imgui_internal:2197",
+    ImGuiLocEntry="imgui_internal:2200",
-    ImGuiLocKey="imgui_internal:2179",
+    ImGuiLocKey="imgui_internal:2182",
-    ImGuiLogFlags_="imgui_internal:1120",
+    ImGuiLogFlags_="imgui_internal:1122",
-    ImGuiMenuColumns="imgui_internal:1177",
+    ImGuiMenuColumns="imgui_internal:1179",
-    ImGuiMetricsConfig="imgui_internal:2263",
+    ImGuiMetricsConfig="imgui_internal:2266",
     ImGuiMouseButton_="imgui:1979",
     ImGuiMouseCursor_="imgui:1989",
     ImGuiMouseSource="imgui:2010",
     ImGuiMultiSelectFlags_="imgui:3068",
     ImGuiMultiSelectIO="imgui:3095",
-    ImGuiMultiSelectState="imgui_internal:1913",
+    ImGuiMultiSelectState="imgui_internal:1916",
-    ImGuiMultiSelectTempData="imgui_internal:1888",
+    ImGuiMultiSelectTempData="imgui_internal:1891",
-    ImGuiNavItemData="imgui_internal:1736",
+    ImGuiNavItemData="imgui_internal:1739",
-    ImGuiNavLayer="imgui_internal:1728",
+    ImGuiNavLayer="imgui_internal:1731",
-    ImGuiNavMoveFlags_="imgui_internal:1706",
+    ImGuiNavMoveFlags_="imgui_internal:1709",
-    ImGuiNavRenderCursorFlags_="imgui_internal:1692",
+    ImGuiNavRenderCursorFlags_="imgui_internal:1694",
-    ImGuiNextItemData="imgui_internal:1336",
+    ImGuiNextItemData="imgui_internal:1338",
-    ImGuiNextItemDataFlags_="imgui_internal:1326",
+    ImGuiNextItemDataFlags_="imgui_internal:1328",
-    ImGuiNextWindowData="imgui_internal:1294",
+    ImGuiNextWindowData="imgui_internal:1296",
-    ImGuiNextWindowDataFlags_="imgui_internal:1274",
+    ImGuiNextWindowDataFlags_="imgui_internal:1276",
-    ImGuiOldColumnData="imgui_internal:1821",
+    ImGuiOldColumnData="imgui_internal:1824",
-    ImGuiOldColumnFlags_="imgui_internal:1801",
+    ImGuiOldColumnFlags_="imgui_internal:1804",
-    ImGuiOldColumns="imgui_internal:1831",
+    ImGuiOldColumns="imgui_internal:1834",
     ImGuiOnceUponAFrame="imgui:2780",
     ImGuiPayload="imgui:2745",
-    ImGuiPlatformIO="imgui:4078",
+    ImGuiPlatformIO="imgui:4081",
-    ImGuiPlatformImeData="imgui:4193",
+    ImGuiPlatformImeData="imgui:4196",
-    ImGuiPlatformMonitor="imgui:4183",
+    ImGuiPlatformMonitor="imgui:4186",
-    ImGuiPlotType="imgui_internal:1139",
+    ImGuiPlotType="imgui_internal:1141",
-    ImGuiPopupData="imgui_internal:1452",
+    ImGuiPopupData="imgui_internal:1454",
     ImGuiPopupFlags_="imgui:1350",
-    ImGuiPopupPositionPolicy="imgui_internal:1444",
+    ImGuiPopupPositionPolicy="imgui_internal:1446",
-    ImGuiPtrOrIndex="imgui_internal:1422",
+    ImGuiPtrOrIndex="imgui_internal:1424",
-    ImGuiScrollFlags_="imgui_internal:1678",
+    ImGuiScrollFlags_="imgui_internal:1680",
-    ImGuiSelectableFlagsPrivate_="imgui_internal:1058",
+    ImGuiSelectableFlagsPrivate_="imgui_internal:1060",
     ImGuiSelectableFlags_="imgui:1368",
     ImGuiSelectionBasicStorage="imgui:3141",
     ImGuiSelectionExternalStorage="imgui:3164",
     ImGuiSelectionRequest="imgui:3115",
     ImGuiSelectionRequestType="imgui:3107",
-    ImGuiSeparatorFlags_="imgui_internal:1081",
+    ImGuiSeparatorFlags_="imgui_internal:1083",
-    ImGuiSettingsHandler="imgui_internal:2159",
+    ImGuiSettingsHandler="imgui_internal:2162",
-    ImGuiShrinkWidthItem="imgui_internal:1415",
+    ImGuiShrinkWidthItem="imgui_internal:1417",
     ImGuiSizeCallbackData="imgui:2714",
-    ImGuiSliderFlagsPrivate_="imgui_internal:1051",
+    ImGuiSliderFlagsPrivate_="imgui_internal:1053",
     ImGuiSliderFlags_="imgui:1963",
     ImGuiSortDirection="imgui:1562",
-    ImGuiStackLevelInfo="imgui_internal:2282",
+    ImGuiStackLevelInfo="imgui_internal:2285",
     ImGuiStorage="imgui:2853",
     ImGuiStoragePair="imgui:2836",
     ImGuiStyle="imgui:2308",
     ImGuiStyleMod="imgui_internal:910",
     ImGuiStyleVarInfo="imgui_internal:894",
     ImGuiStyleVar_="imgui:1852",
-    ImGuiTabBar="imgui_internal:2974",
+    ImGuiTabBar="imgui_internal:2982",
-    ImGuiTabBarFlagsPrivate_="imgui_internal:2936",
+    ImGuiTabBarFlagsPrivate_="imgui_internal:2944",
     ImGuiTabBarFlags_="imgui:1400",
-    ImGuiTabItem="imgui_internal:2954",
+    ImGuiTabItem="imgui_internal:2962",
-    ImGuiTabItemFlagsPrivate_="imgui_internal:2944",
+    ImGuiTabItemFlagsPrivate_="imgui_internal:2952",
     ImGuiTabItemFlags_="imgui:1417",
-    ImGuiTable="imgui_internal:3117",
+    ImGuiTable="imgui_internal:3125",
     ImGuiTableBgTarget_="imgui:2162",
-    ImGuiTableCellData="imgui_internal:3085",
+    ImGuiTableCellData="imgui_internal:3093",
-    ImGuiTableColumn="imgui_internal:3025",
+    ImGuiTableColumn="imgui_internal:3033",
     ImGuiTableColumnFlags_="imgui:2109",
-    ImGuiTableColumnSettings="imgui_internal:3265",
+    ImGuiTableColumnSettings="imgui_internal:3273",
     ImGuiTableColumnSortSpecs="imgui:2184",
     ImGuiTableFlags_="imgui:2056",
-    ImGuiTableHeaderData="imgui_internal:3094",
+    ImGuiTableHeaderData="imgui_internal:3102",
-    ImGuiTableInstanceData="imgui_internal:3104",
+    ImGuiTableInstanceData="imgui_internal:3112",
     ImGuiTableRowFlags_="imgui:2147",
-    ImGuiTableSettings="imgui_internal:3289",
+    ImGuiTableSettings="imgui_internal:3297",
     ImGuiTableSortSpecs="imgui:2174",
-    ImGuiTableTempData="imgui_internal:3242",
+    ImGuiTableTempData="imgui_internal:3250",
     ImGuiTextBuffer="imgui:2815",
     ImGuiTextFilter="imgui:2788",
-    ImGuiTextFlags_="imgui_internal:1099",
+    ImGuiTextFlags_="imgui_internal:1101",
     ImGuiTextIndex="imgui_internal:800",
     ImGuiTextRange="imgui:2798",
-    ImGuiTooltipFlags_="imgui_internal:1105",
+    ImGuiTooltipFlags_="imgui_internal:1107",
-    ImGuiTreeNodeFlagsPrivate_="imgui_internal:1072",
+    ImGuiTreeNodeFlagsPrivate_="imgui_internal:1074",
     ImGuiTreeNodeFlags_="imgui:1306",
-    ImGuiTreeNodeStackData="imgui_internal:1376",
+    ImGuiTreeNodeStackData="imgui_internal:1378",
-    ImGuiTypingSelectFlags_="imgui_internal:1764",
+    ImGuiTypingSelectFlags_="imgui_internal:1767",
-    ImGuiTypingSelectRequest="imgui_internal:1772",
+    ImGuiTypingSelectRequest="imgui_internal:1775",
-    ImGuiTypingSelectState="imgui_internal:1783",
+    ImGuiTypingSelectState="imgui_internal:1786",
-    ImGuiViewport="imgui:3992",
+    ImGuiViewport="imgui:3995",
-    ImGuiViewportFlags_="imgui:3964",
+    ImGuiViewportFlags_="imgui:3967",
-    ImGuiViewportP="imgui_internal:2088",
+    ImGuiViewportP="imgui_internal:2091",
-    ImGuiWindow="imgui_internal:2781",
+    ImGuiWindow="imgui_internal:2789",
     ImGuiWindowClass="imgui:2729",
-    ImGuiWindowDockStyle="imgui_internal:2066",
+    ImGuiWindowDockStyle="imgui_internal:2069",
-    ImGuiWindowDockStyleCol="imgui_internal:2052",
+    ImGuiWindowDockStyleCol="imgui_internal:2055",
     ImGuiWindowFlags_="imgui:1179",
-    ImGuiWindowRefreshFlags_="imgui_internal:1265",
+    ImGuiWindowRefreshFlags_="imgui_internal:1267",
-    ImGuiWindowSettings="imgui_internal:2140",
+    ImGuiWindowSettings="imgui_internal:2143",
-    ImGuiWindowStackData="imgui_internal:1406",
+    ImGuiWindowStackData="imgui_internal:1408",
-    ImGuiWindowTempData="imgui_internal:2724",
+    ImGuiWindowTempData="imgui_internal:2732",
     ImRect="imgui_internal:569",
-    ImTextureData="imgui:3542",
+    ImTextureData="imgui:3544",
-    ImTextureFormat="imgui:3510",
+    ImTextureFormat="imgui:3512",
-    ImTextureRect="imgui:3529",
+    ImTextureRect="imgui:3531",
     ImTextureRef="imgui:360",
-    ImTextureStatus="imgui:3517",
+    ImTextureStatus="imgui:3519",
     ImVec1="imgui_internal:543",
     ImVec2="imgui:292",
     ImVec2i="imgui_internal:551",
     ImVec2ih="imgui_internal:559",
     ImVec4="imgui:305",
-    stbrp_context_opaque="imgui_internal:4062"},
+    stbrp_context_opaque="imgui_internal:4074"},
   nonPOD={
     ImBitArray=true,
     ImColor=true,
@@ -5047,14 +5047,14 @@ local t={
         name="PixelSnapV",
         type="bool"},
       [8]={
-        name="FontNo",
-        type="ImS8"},
-      [9]={
         name="OversampleH",
         type="ImS8"},
-      [10]={
+      [9]={
         name="OversampleV",
         type="ImS8"},
+      [10]={
+        name="EllipsisChar",
+        type="ImWchar"},
       [11]={
         name="SizePixels",
         type="float"},
@@ -5077,17 +5077,17 @@ local t={
         name="GlyphExtraAdvanceX",
         type="float"},
       [18]={
+        name="FontNo",
+        type="ImU32"},
+      [19]={
         name="FontLoaderFlags",
         type="unsigned int"},
-      [19]={
+      [20]={
         name="RasterizerMultiply",
         type="float"},
-      [20]={
+      [21]={
         name="RasterizerDensity",
         type="float"},
-      [21]={
-        name="EllipsisChar",
-        type="ImWchar"},
       [22]={
         name="Flags",
         type="ImFontFlags"},
@@ -5179,7 +5179,7 @@ local t={
         type="void(*)(ImFontAtlas* atlas,ImFontConfig* src,ImFontBaked* baked,void* loader_data_for_baked_src)"},
       [9]={
         name="FontBakedLoadGlyph",
-        type="bool(*)(ImFontAtlas* atlas,ImFontConfig* src,ImFontBaked* baked,void* loader_data_for_baked_src,ImWchar codepoint,ImFontGlyph* out_glyph)"},
+        type="bool(*)(ImFontAtlas* atlas,ImFontConfig* src,ImFontBaked* baked,void* loader_data_for_baked_src,ImWchar codepoint,ImFontGlyph* out_glyph,float* out_advance_x)"},
       [10]={
         name="FontBakedSrcLoaderDataSize",
         type="size_t"}},
@@ -5429,7 +5429,7 @@ local t={
         name="WheelingAxisAvg",
         type="ImVec2"},
       [52]={
-        name="DebugDrawIdConflicts",
+        name="DebugDrawIdConflictsId",
         type="ImGuiID"},
       [53]={
         name="DebugHookIdInfo",