Merge branch 'docking_inter'

This commit is contained in:
sonoro1234
2023-09-08 18:09:15 +02:00
18 changed files with 5270 additions and 4027 deletions

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.89.5" 18950 from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.89.9" 18990 from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#ifdef IMGUI_ENABLE_FREETYPE
#ifndef CIMGUI_FREETYPE
@@ -1060,6 +1060,21 @@ CIMGUI_API void igSetTooltipV(const char* fmt,va_list args)
{
return ImGui::SetTooltipV(fmt,args);
}
CIMGUI_API bool igBeginItemTooltip()
{
return ImGui::BeginItemTooltip();
}
CIMGUI_API void igSetItemTooltip(const char* fmt,...)
{
va_list args;
va_start(args, fmt);
ImGui::SetItemTooltipV(fmt,args);
va_end(args);
}
CIMGUI_API void igSetItemTooltipV(const char* fmt,va_list args)
{
return ImGui::SetItemTooltipV(fmt,args);
}
CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
{
return ImGui::BeginPopup(str_id,flags);
@@ -1304,6 +1319,10 @@ CIMGUI_API void igSetKeyboardFocusHere(int offset)
{
return ImGui::SetKeyboardFocusHere(offset);
}
CIMGUI_API void igSetNextItemAllowOverlap()
{
return ImGui::SetNextItemAllowOverlap();
}
CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags)
{
return ImGui::IsItemHovered(flags);
@@ -1372,10 +1391,6 @@ CIMGUI_API void igGetItemRectSize(ImVec2 *pOut)
{
*pOut = ImGui::GetItemRectSize();
}
CIMGUI_API void igSetItemAllowOverlap()
{
return ImGui::SetItemAllowOverlap();
}
CIMGUI_API ImGuiViewport* igGetMainViewport()
{
return ImGui::GetMainViewport();
@@ -1644,9 +1659,9 @@ CIMGUI_API void ImGuiIO_SetAppAcceptingEvents(ImGuiIO* self,bool accepting_event
{
return self->SetAppAcceptingEvents(accepting_events);
}
CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
CIMGUI_API void ImGuiIO_ClearEventsQueue(ImGuiIO* self)
{
return self->ClearInputCharacters();
return self->ClearEventsQueue();
}
CIMGUI_API void ImGuiIO_ClearInputKeys(ImGuiIO* self)
{
@@ -1924,9 +1939,13 @@ CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
{
return self->Step();
}
CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max)
CIMGUI_API void ImGuiListClipper_IncludeItemByIndex(ImGuiListClipper* self,int item_index)
{
return self->ForceDisplayRangeByIndices(item_min,item_max);
return self->IncludeItemByIndex(item_index);
}
CIMGUI_API void ImGuiListClipper_IncludeItemsByIndex(ImGuiListClipper* self,int item_begin,int item_end)
{
return self->IncludeItemsByIndex(item_begin,item_end);
}
CIMGUI_API ImColor* ImColor_ImColor_Nil(void)
{
@@ -2268,6 +2287,10 @@ CIMGUI_API void ImDrawData_Clear(ImDrawData* self)
{
return self->Clear();
}
CIMGUI_API void ImDrawData_AddDrawList(ImDrawData* self,ImDrawList* draw_list)
{
return self->AddDrawList(draw_list);
}
CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
{
return self->DeIndexAllBuffers();
@@ -2907,10 +2930,6 @@ CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c)
{
return ImTriangleArea(a,b,c);
}
CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy)
{
return ImGetDirQuadrantFromDelta(dx,dy);
}
CIMGUI_API ImVec1* ImVec1_ImVec1_Nil(void)
{
return IM_NEW(ImVec1)();
@@ -3131,21 +3150,13 @@ CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSha
{
return self->SetCircleTessellationMaxError(max_error);
}
CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
CIMGUI_API ImDrawDataBuilder* ImDrawDataBuilder_ImDrawDataBuilder(void)
{
return self->Clear();
return IM_NEW(ImDrawDataBuilder)();
}
CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
CIMGUI_API void ImDrawDataBuilder_destroy(ImDrawDataBuilder* self)
{
return self->ClearFreeMemory();
}
CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
{
return self->GetDrawListCount();
}
CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
{
return self->FlattenIntoSingleLayer();
IM_DELETE(self);
}
CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent)
{
@@ -3687,13 +3698,17 @@ CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRe
{
*pOut = ImGui::WindowRectRelToAbs(window,r);
}
CIMGUI_API void igFocusWindow(ImGuiWindow* window)
CIMGUI_API void igWindowPosRelToAbs(ImVec2 *pOut,ImGuiWindow* window,const ImVec2 p)
{
return ImGui::FocusWindow(window);
*pOut = ImGui::WindowPosRelToAbs(window,p);
}
CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window)
CIMGUI_API void igFocusWindow(ImGuiWindow* window,ImGuiFocusRequestFlags flags)
{
return ImGui::FocusTopMostWindowUnderOne(under_this_window,ignore_window);
return ImGui::FocusWindow(window,flags);
}
CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window,ImGuiViewport* filter_viewport,ImGuiFocusRequestFlags flags)
{
return ImGui::FocusTopMostWindowUnderOne(under_this_window,ignore_window,filter_viewport,flags);
}
CIMGUI_API void igBringWindowToFocusFront(ImGuiWindow* window)
{
@@ -3739,6 +3754,10 @@ CIMGUI_API ImDrawList* igGetForegroundDrawList_ViewportPtr(ImGuiViewport* viewpo
{
return ImGui::GetForegroundDrawList(viewport);
}
CIMGUI_API void igAddDrawListToDrawDataEx(ImDrawData* draw_data,ImVector_ImDrawListPtr* out_list,ImDrawList* draw_list)
{
return ImGui::AddDrawListToDrawDataEx(draw_data,out_list,draw_list);
}
CIMGUI_API void igInitialize()
{
return ImGui::Initialize();
@@ -3931,9 +3950,9 @@ CIMGUI_API bool igItemAdd(const ImRect bb,ImGuiID id,const ImRect* nav_bb,ImGuiI
{
return ImGui::ItemAdd(bb,id,nav_bb,extra_flags);
}
CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id)
CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id,ImGuiItemFlags item_flags)
{
return ImGui::ItemHoverable(bb,id);
return ImGui::ItemHoverable(bb,id,item_flags);
}
CIMGUI_API bool igIsWindowContentHoverable(ImGuiWindow* window,ImGuiHoveredFlags flags)
{
@@ -4043,6 +4062,10 @@ CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal()
{
return ImGui::GetTopMostAndVisiblePopupModal();
}
CIMGUI_API ImGuiWindow* igFindBlockingModal(ImGuiWindow* window)
{
return ImGui::FindBlockingModal(window);
}
CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window)
{
*pOut = ImGui::FindBestWindowPosForPopup(window);
@@ -4099,6 +4122,10 @@ CIMGUI_API void igNavMoveRequestResolveWithLastItem(ImGuiNavItemData* result)
{
return ImGui::NavMoveRequestResolveWithLastItem(result);
}
CIMGUI_API void igNavMoveRequestResolveWithPastTreeNode(ImGuiNavItemData* result,ImGuiNavTreeNodeData* tree_node_data)
{
return ImGui::NavMoveRequestResolveWithPastTreeNode(result,tree_node_data);
}
CIMGUI_API void igNavMoveRequestCancel()
{
return ImGui::NavMoveRequestCancel();
@@ -4111,9 +4138,13 @@ CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlag
{
return ImGui::NavMoveRequestTryWrapping(window,move_flags);
}
CIMGUI_API void igActivateItem(ImGuiID id)
CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis)
{
return ImGui::ActivateItem(id);
return ImGui::NavClearPreferredPosForAxis(axis);
}
CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX()
{
return ImGui::NavUpdateCurrentWindowIsScrollPushableX();
}
CIMGUI_API void igSetNavWindow(ImGuiWindow* window)
{
@@ -4123,6 +4154,14 @@ CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scop
{
return ImGui::SetNavID(id,nav_layer,focus_scope_id,rect_rel);
}
CIMGUI_API void igFocusItem()
{
return ImGui::FocusItem();
}
CIMGUI_API void igActivateItemByID(ImGuiID id)
{
return ImGui::ActivateItemByID(id);
}
CIMGUI_API bool igIsNamedKey(ImGuiKey key)
{
return ImGui::IsNamedKey(key);
@@ -4355,6 +4394,10 @@ CIMGUI_API int igTableGetHoveredColumn()
{
return ImGui::TableGetHoveredColumn();
}
CIMGUI_API int igTableGetHoveredRow()
{
return ImGui::TableGetHoveredRow();
}
CIMGUI_API float igTableGetHeaderRowHeight()
{
return ImGui::TableGetHeaderRowHeight();
@@ -4687,9 +4730,9 @@ CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 s
{
return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,bg_col,tint_col,flags);
}
CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags)
CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags,float thickness)
{
return ImGui::SeparatorEx(flags);
return ImGui::SeparatorEx(flags,thickness);
}
CIMGUI_API void igSeparatorTextEx(ImGuiID id,const char* label,const char* label_end,float extra_width)
{
@@ -4874,6 +4917,18 @@ CIMGUI_API void igErrorCheckUsingSetCursorPosToExtendParentBoundaries()
{
return ImGui::ErrorCheckUsingSetCursorPosToExtendParentBoundaries();
}
CIMGUI_API void igDebugDrawCursorPos(ImU32 col)
{
return ImGui::DebugDrawCursorPos(col);
}
CIMGUI_API void igDebugDrawLineExtents(ImU32 col)
{
return ImGui::DebugDrawLineExtents(col);
}
CIMGUI_API void igDebugDrawItemRect(ImU32 col)
{
return ImGui::DebugDrawItemRect(col);
}
CIMGUI_API void igDebugLocateItem(ImGuiID target_id)
{
return ImGui::DebugLocateItem(target_id);
@@ -4886,10 +4941,6 @@ CIMGUI_API void igDebugLocateItemResolveWithLastItem()
{
return ImGui::DebugLocateItemResolveWithLastItem();
}
CIMGUI_API void igDebugDrawItemRect(ImU32 col)
{
return ImGui::DebugDrawItemRect(col);
}
CIMGUI_API void igDebugStartItemPicker()
{
return ImGui::DebugStartItemPicker();
@@ -4906,9 +4957,9 @@ CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns)
{
return ImGui::DebugNodeColumns(columns);
}
CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_list,const char* label)
CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,ImGuiViewportP* viewport,const ImDrawList* draw_list,const char* label)
{
return ImGui::DebugNodeDrawList(window,draw_list,label);
return ImGui::DebugNodeDrawList(window,viewport,draw_list,label);
}
CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
{