kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-10 20:08:31 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'docking_inter'

Browse Source
This commit is contained in:
sonoro1234
2024-02-24 13:15:42 +01:00
parent c7133969db 4486dace2a
commit f0fb387921
9 changed files with 1514 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cimgui.cpp
View File

@@ -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.3" 19030 from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.90.4" 19040 from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#ifdef IMGUI_ENABLE_FREETYPE
#ifndef CIMGUI_FREETYPE
@@ -407,9 +407,9 @@ CIMGUI_API ImU32 igGetColorU32_Vec4(const ImVec4 col)
{
return ImGui::GetColorU32(col);
}
CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col)
CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col,float alpha_mul)
{
return ImGui::GetColorU32(col);
return ImGui::GetColorU32(col,alpha_mul);
}
CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx)
{
@@ -1583,6 +1583,10 @@ CIMGUI_API void igDebugFlashStyleColor(ImGuiCol idx)
{
return ImGui::DebugFlashStyleColor(idx);
}
CIMGUI_API void igDebugStartItemPicker()
{
return ImGui::DebugStartItemPicker();
}
CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
{
return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
@@ -4526,9 +4530,9 @@ CIMGUI_API void igTablePopBackgroundChannel()
{
return ImGui::TablePopBackgroundChannel();
}
CIMGUI_API void igTableAngledHeadersRowEx(float angle,float label_width)
CIMGUI_API void igTableAngledHeadersRowEx(float angle,float max_label_width)
{
return ImGui::TableAngledHeadersRowEx(angle,label_width);
return ImGui::TableAngledHeadersRowEx(angle,max_label_width);
}
CIMGUI_API ImGuiTable* igGetCurrentTable()
{
@@ -5085,10 +5089,6 @@ CIMGUI_API void igDebugBreakButtonTooltip(bool keyboard_only,const char* descrip
{
return ImGui::DebugBreakButtonTooltip(keyboard_only,description_of_location);
}
CIMGUI_API void igDebugStartItemPicker()
{
return ImGui::DebugStartItemPicker();
}
CIMGUI_API void igShowFontAtlas(ImFontAtlas* atlas)
{
return ImGui::ShowFontAtlas(atlas);