Merge branch 'docking_inter'

This commit is contained in:
sonoro1234
2024-02-14 11:17:50 +01:00
11 changed files with 3767 additions and 3219 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.90.1" 19010 from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.90.2" 19020 from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#ifdef IMGUI_ENABLE_FREETYPE
#ifndef CIMGUI_FREETYPE
@@ -3182,10 +3182,6 @@ 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);
@@ -3302,13 +3298,17 @@ CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self)
{
return self->SelectAll();
}
CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndSelectAll(ImGuiInputTextState* self)
{
return IM_NEW(ImGuiPopupData)();
return self->ReloadUserBufAndSelectAll();
}
CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndKeepSelection(ImGuiInputTextState* self)
{
IM_DELETE(self);
return self->ReloadUserBufAndKeepSelection();
}
CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndMoveToEnd(ImGuiInputTextState* self)
{
return self->ReloadUserBufAndMoveToEnd();
}
CIMGUI_API ImGuiNextWindowData* ImGuiNextWindowData_ImGuiNextWindowData(void)
{
@@ -3370,6 +3370,18 @@ 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)();
}
CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
{
IM_DELETE(self);
}
CIMGUI_API ImGuiInputEvent* ImGuiInputEvent_ImGuiInputEvent(void)
{
return IM_NEW(ImGuiInputEvent)();
@@ -3734,6 +3746,10 @@ CIMGUI_API void igSetWindowHiddenAndSkipItemsForCurrentFrame(ImGuiWindow* window
{
return ImGui::SetWindowHiddenAndSkipItemsForCurrentFrame(window);
}
CIMGUI_API void igSetWindowParentWindowForFocusRoute(ImGuiWindow* window,ImGuiWindow* parent_window)
{
return ImGui::SetWindowParentWindowForFocusRoute(window,parent_window);
}
CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
{
*pOut = ImGui::WindowRectAbsToRel(window,r);
@@ -4186,6 +4202,10 @@ CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlag
{
return ImGui::NavMoveRequestTryWrapping(window,move_flags);
}
CIMGUI_API void igNavHighlightActivated(ImGuiID id)
{
return ImGui::NavHighlightActivated(id);
}
CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis)
{
return ImGui::NavClearPreferredPosForAxis(axis);
@@ -4206,6 +4226,10 @@ 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 igSetNavFocusScope(ImGuiID focus_scope_id)
{
return ImGui::SetNavFocusScope(focus_scope_id);
}
CIMGUI_API void igFocusItem()
{
return ImGui::FocusItem();
@@ -4242,9 +4266,13 @@ CIMGUI_API bool igIsAliasKey(ImGuiKey key)
{
return ImGui::IsAliasKey(key);
}
CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord)
CIMGUI_API bool igIsModKey(ImGuiKey key)
{
return ImGui::ConvertShortcutMod(key_chord);
return ImGui::IsModKey(key);
}
CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,ImGuiKeyChord key_chord)
{
return ImGui::FixupKeyChord(ctx,key_chord);
}
CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
{
@@ -4258,9 +4286,9 @@ CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key)
{
return ImGui::GetKeyData(key);
}
CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord,char* out_buf,int out_buf_size)
CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord)
{
return ImGui::GetKeyChordName(key_chord,out_buf,out_buf_size);
return ImGui::GetKeyChordName(key_chord);
}
CIMGUI_API ImGuiKey igMouseButtonToKey(ImGuiMouseButton button)
{
@@ -4354,6 +4382,10 @@ CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,
{
return ImGui::IsKeyChordPressed(key_chord,owner_id,flags);
}
CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord)
{
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);