mirrors/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2026-05-31 05:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'docking_inter'

Browse Source
This commit is contained in:
sonoro1234
2026-05-30 12:05:39 +02:00
parent d3f0c2f4a7 bbddc623b5
commit d298666861
18 changed files with 5777 additions and 3549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
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.92.7" 19270 from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.92.8" 19280 from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
//with imgui_freetype.h api
@@ -1725,7 +1725,7 @@ CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags fl
{
return ImGui::SetNextItemShortcut(key_chord,flags);
}
CIMGUI_API void igSetItemKeyOwner_Nil(ImGuiKey key)
CIMGUI_API bool igSetItemKeyOwner_Nil(ImGuiKey key)
{
return ImGui::SetItemKeyOwner(key);
}
@@ -2394,9 +2394,17 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2_c p1,const ImVe
{
return self->AddLine(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),col,thickness);
}
CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
CIMGUI_API void ImDrawList_AddLineH(ImDrawList* self,float min_x,float max_x,float y,ImU32 col,float thickness)
{
return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,flags,thickness);
return self->AddLineH(min_x,max_x,y,col,thickness);
}
CIMGUI_API void ImDrawList_AddLineV(ImDrawList* self,float x,float min_y,float max_y,ImU32 col,float thickness)
{
return self->AddLineV(x,min_y,max_y,col,thickness);
}
CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,float thickness,ImDrawFlags flags)
{
return self->AddRect(ConvertToCPP_ImVec2(p_min),ConvertToCPP_ImVec2(p_max),col,rounding,thickness,flags);
}
CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2_c p_min,const ImVec2_c p_max,ImU32 col,float rounding,ImDrawFlags flags)
{
@@ -2462,9 +2470,9 @@ CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2_c p1
{
return self->AddBezierQuadratic(ConvertToCPP_ImVec2(p1),ConvertToCPP_ImVec2(p2),ConvertToCPP_ImVec2(p3),col,thickness,num_segments);
}
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col,float thickness,ImDrawFlags flags)
{
return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,flags,thickness);
return self->AddPolyline(reinterpret_cast<const ImVec2*>(points),num_points,col,thickness,flags);
}
CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2_c* points,int num_points,ImU32 col)
{
@@ -2506,9 +2514,9 @@ CIMGUI_API void ImDrawList_PathFillConcave(ImDrawList* self,ImU32 col)
{
return self->PathFillConcave(col);
}
CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,float thickness,ImDrawFlags flags)
{
return self->PathStroke(col,flags,thickness);
return self->PathStroke(col,thickness,flags);
}
CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2_c center,float radius,float a_min,float a_max,int num_segments)
{
@@ -2818,6 +2826,10 @@ CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self)
{
return self->Clear();
}
CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
{
return self->ClearFonts();
}
CIMGUI_API void ImFontAtlas_CompactCache(ImFontAtlas* self)
{
return self->CompactCache();
@@ -2830,10 +2842,6 @@ CIMGUI_API void ImFontAtlas_ClearInputData(ImFontAtlas* self)
{
return self->ClearInputData();
}
CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self)
{
return self->ClearFonts();
}
CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self)
{
return self->ClearTexData();
@@ -3529,6 +3537,14 @@ CIMGUI_API void ImRect_Add_Rect(ImRect* self,const ImRect_c r)
{
return self->Add(ConvertToCPP_ImRect(r));
}
CIMGUI_API void ImRect_AddX(ImRect* self,float x)
{
return self->AddX(x);
}
CIMGUI_API void ImRect_AddY(ImRect* self,float y)
{
return self->AddY(y);
}
CIMGUI_API void ImRect_Expand_Float(ImRect* self,const float amount)
{
return self->Expand(amount);
@@ -4669,6 +4685,10 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2_c size_a
{
return ImGui::BeginChildEx(name,id,ConvertToCPP_ImVec2(size_arg),child_flags,window_flags);
}
CIMGUI_API ImGuiWindow* igFindFrontMostVisibleChildWindow(ImGuiWindow* window)
{
return ImGui::FindFrontMostVisibleChildWindow(window);
}
CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_window_flags)
{
return ImGui::BeginPopupEx(id,extra_window_flags);
@@ -4941,7 +4961,7 @@ CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImG
{
return ImGui::SetKeyOwnersForKeyChord(key,owner_id,flags);
}
CIMGUI_API void igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
CIMGUI_API bool igSetItemKeyOwner_InputFlags(ImGuiKey key,ImGuiInputFlags flags)
{
return ImGui::SetItemKeyOwner(key,flags);
}
@@ -5009,6 +5029,10 @@ CIMGUI_API void igPopFocusScope()
{
return ImGui::PopFocusScope();
}
CIMGUI_API bool igIsInNavFocusRoute(ImGuiID focus_scope_id)
{
return ImGui::IsInNavFocusRoute(focus_scope_id);
}
CIMGUI_API ImGuiID igGetCurrentFocusScope()
{
return ImGui::GetCurrentFocusScope();
@@ -5037,9 +5061,9 @@ CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect_c bb)
{
return ImGui::RenderDragDropTargetRectForItem(ConvertToCPP_ImRect(bb));
}
CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb)
CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList* draw_list,const ImRect_c bb,float rounding)
{
return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb));
return ImGui::RenderDragDropTargetRectEx(draw_list,ConvertToCPP_ImRect(bb),rounding);
}
CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags)
{
@@ -5209,6 +5233,10 @@ CIMGUI_API void igTableUpdateColumnsWeightFromWidth(ImGuiTable* table)
{
return ImGui::TableUpdateColumnsWeightFromWidth(table);
}
CIMGUI_API void igTableApplyExternalUnclipRect(ImGuiTable* table,ImRect* rect)
{
return ImGui::TableApplyExternalUnclipRect(table,*rect);
}
CIMGUI_API void igTableDrawBorders(ImGuiTable* table)
{
return ImGui::TableDrawBorders(table);
@@ -6150,6 +6178,10 @@ CIMGUI_API void igImFontAtlasTextureBlockQueueUpload(ImFontAtlas* atlas,ImTextur
{
return ImFontAtlasTextureBlockQueueUpload(atlas,tex,x,y,w,h);
}
CIMGUI_API void igImTextureDataQueueUpload(ImTextureData* tex,int x,int y,int w,int h)
{
return ImTextureDataQueueUpload(tex,x,y,w,h);
}
CIMGUI_API int igImTextureDataGetFormatBytesPerPixel(ImTextureFormat format)
{
return ImTextureDataGetFormatBytesPerPixel(format);