mirror of
https://github.com/cimgui/cimgui.git
synced 2025-08-16 22:28:30 +01:00
Merge branch 'docking_inter'
This commit is contained in:
80
cimgui.cpp
80
cimgui.cpp
@@ -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.3" 18930 from Dear ImGui https://github.com/ocornut/imgui
|
||||
//based on imgui.h file version "1.89.5" 18950 from Dear ImGui https://github.com/ocornut/imgui
|
||||
//with imgui_internal.h api
|
||||
#ifdef IMGUI_ENABLE_FREETYPE
|
||||
#ifndef CIMGUI_FREETYPE
|
||||
@@ -347,13 +347,13 @@ CIMGUI_API void igPopStyleVar(int count)
|
||||
{
|
||||
return ImGui::PopStyleVar(count);
|
||||
}
|
||||
CIMGUI_API void igPushAllowKeyboardFocus(bool allow_keyboard_focus)
|
||||
CIMGUI_API void igPushTabStop(bool tab_stop)
|
||||
{
|
||||
return ImGui::PushAllowKeyboardFocus(allow_keyboard_focus);
|
||||
return ImGui::PushTabStop(tab_stop);
|
||||
}
|
||||
CIMGUI_API void igPopAllowKeyboardFocus()
|
||||
CIMGUI_API void igPopTabStop()
|
||||
{
|
||||
return ImGui::PopAllowKeyboardFocus();
|
||||
return ImGui::PopTabStop();
|
||||
}
|
||||
CIMGUI_API void igPushButtonRepeat(bool repeat)
|
||||
{
|
||||
@@ -1041,7 +1041,7 @@ CIMGUI_API bool igMenuItem_BoolPtr(const char* label,const char* shortcut,bool*
|
||||
{
|
||||
return ImGui::MenuItem(label,shortcut,p_selected,enabled);
|
||||
}
|
||||
CIMGUI_API void igBeginTooltip()
|
||||
CIMGUI_API bool igBeginTooltip()
|
||||
{
|
||||
return ImGui::BeginTooltip();
|
||||
}
|
||||
@@ -1616,6 +1616,10 @@ CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wheel_x,float whe
|
||||
{
|
||||
return self->AddMouseWheelEvent(wheel_x,wheel_y);
|
||||
}
|
||||
CIMGUI_API void ImGuiIO_AddMouseSourceEvent(ImGuiIO* self,ImGuiMouseSource source)
|
||||
{
|
||||
return self->AddMouseSourceEvent(source);
|
||||
}
|
||||
CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused)
|
||||
{
|
||||
return self->AddFocusEvent(focused);
|
||||
@@ -3143,6 +3147,10 @@ CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self
|
||||
{
|
||||
return self->FlattenIntoSingleLayer();
|
||||
}
|
||||
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);
|
||||
@@ -3187,9 +3195,21 @@ CIMGUI_API void ImGuiMenuColumns_CalcNextTotalWidth(ImGuiMenuColumns* self,bool
|
||||
{
|
||||
return self->CalcNextTotalWidth(update_offsets);
|
||||
}
|
||||
CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(ImGuiContext* ctx)
|
||||
CIMGUI_API ImGuiInputTextDeactivatedState* ImGuiInputTextDeactivatedState_ImGuiInputTextDeactivatedState(void)
|
||||
{
|
||||
return IM_NEW(ImGuiInputTextState)(ctx);
|
||||
return IM_NEW(ImGuiInputTextDeactivatedState)();
|
||||
}
|
||||
CIMGUI_API void ImGuiInputTextDeactivatedState_destroy(ImGuiInputTextDeactivatedState* self)
|
||||
{
|
||||
IM_DELETE(self);
|
||||
}
|
||||
CIMGUI_API void ImGuiInputTextDeactivatedState_ClearFreeMemory(ImGuiInputTextDeactivatedState* self)
|
||||
{
|
||||
return self->ClearFreeMemory();
|
||||
}
|
||||
CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(void)
|
||||
{
|
||||
return IM_NEW(ImGuiInputTextState)();
|
||||
}
|
||||
CIMGUI_API void ImGuiInputTextState_destroy(ImGuiInputTextState* self)
|
||||
{
|
||||
@@ -3295,13 +3315,13 @@ CIMGUI_API void ImGuiStackSizes_destroy(ImGuiStackSizes* self)
|
||||
{
|
||||
IM_DELETE(self);
|
||||
}
|
||||
CIMGUI_API void ImGuiStackSizes_SetToCurrentState(ImGuiStackSizes* self)
|
||||
CIMGUI_API void ImGuiStackSizes_SetToContextState(ImGuiStackSizes* self,ImGuiContext* ctx)
|
||||
{
|
||||
return self->SetToCurrentState();
|
||||
return self->SetToContextState(ctx);
|
||||
}
|
||||
CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self)
|
||||
CIMGUI_API void ImGuiStackSizes_CompareWithContextState(ImGuiStackSizes* self,ImGuiContext* ctx)
|
||||
{
|
||||
return self->CompareWithCurrentState();
|
||||
return self->CompareWithContextState(ctx);
|
||||
}
|
||||
CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr)
|
||||
{
|
||||
@@ -3655,6 +3675,10 @@ CIMGUI_API void igSetWindowHitTestHole(ImGuiWindow* window,const ImVec2 pos,cons
|
||||
{
|
||||
return ImGui::SetWindowHitTestHole(window,pos,size);
|
||||
}
|
||||
CIMGUI_API void igSetWindowHiddendAndSkipItemsForCurrentFrame(ImGuiWindow* window)
|
||||
{
|
||||
return ImGui::SetWindowHiddendAndSkipItemsForCurrentFrame(window);
|
||||
}
|
||||
CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
|
||||
{
|
||||
*pOut = ImGui::WindowRectAbsToRel(window,r);
|
||||
@@ -3911,6 +3935,10 @@ CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id)
|
||||
{
|
||||
return ImGui::ItemHoverable(bb,id);
|
||||
}
|
||||
CIMGUI_API bool igIsWindowContentHoverable(ImGuiWindow* window,ImGuiHoveredFlags flags)
|
||||
{
|
||||
return ImGui::IsWindowContentHoverable(window,flags);
|
||||
}
|
||||
CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id)
|
||||
{
|
||||
return ImGui::IsClippedEx(bb,id);
|
||||
@@ -3951,6 +3979,10 @@ CIMGUI_API void igPopItemFlag()
|
||||
{
|
||||
return ImGui::PopItemFlag();
|
||||
}
|
||||
CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx)
|
||||
{
|
||||
return ImGui::GetStyleVarInfo(idx);
|
||||
}
|
||||
CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth)
|
||||
{
|
||||
return ImGui::LogBegin(type,auto_open_depth);
|
||||
@@ -3995,7 +4027,7 @@ CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
|
||||
{
|
||||
return ImGui::BeginPopupEx(id,extra_flags);
|
||||
}
|
||||
CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
|
||||
CIMGUI_API bool igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
|
||||
{
|
||||
return ImGui::BeginTooltipEx(tooltip_flags,extra_window_flags);
|
||||
}
|
||||
@@ -4123,11 +4155,15 @@ CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord)
|
||||
{
|
||||
return ImGui::ConvertShortcutMod(key_chord);
|
||||
}
|
||||
CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key)
|
||||
CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
|
||||
{
|
||||
return ImGui::ConvertSingleModFlagToKey(key);
|
||||
return ImGui::ConvertSingleModFlagToKey(ctx,key);
|
||||
}
|
||||
CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key)
|
||||
CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key)
|
||||
{
|
||||
return ImGui::GetKeyData(ctx,key);
|
||||
}
|
||||
CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key)
|
||||
{
|
||||
return ImGui::GetKeyData(key);
|
||||
}
|
||||
@@ -4175,6 +4211,10 @@ CIMGUI_API void igSetKeyOwner(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flag
|
||||
{
|
||||
return ImGui::SetKeyOwner(key,owner_id,flags);
|
||||
}
|
||||
CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImGuiInputFlags flags)
|
||||
{
|
||||
return ImGui::SetKeyOwnersForKeyChord(key,owner_id,flags);
|
||||
}
|
||||
CIMGUI_API void igSetItemKeyOwner(ImGuiKey key,ImGuiInputFlags flags)
|
||||
{
|
||||
return ImGui::SetItemKeyOwner(key,flags);
|
||||
@@ -4183,9 +4223,9 @@ CIMGUI_API bool igTestKeyOwner(ImGuiKey key,ImGuiID owner_id)
|
||||
{
|
||||
return ImGui::TestKeyOwner(key,owner_id);
|
||||
}
|
||||
CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiKey key)
|
||||
CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiContext* ctx,ImGuiKey key)
|
||||
{
|
||||
return ImGui::GetKeyOwnerData(key);
|
||||
return ImGui::GetKeyOwnerData(ctx,key);
|
||||
}
|
||||
CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id)
|
||||
{
|
||||
@@ -4755,6 +4795,10 @@ CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int b
|
||||
{
|
||||
return ImGui::InputTextEx(label,hint,buf,buf_size,size_arg,flags,callback,user_data);
|
||||
}
|
||||
CIMGUI_API void igInputTextDeactivateHook(ImGuiID id)
|
||||
{
|
||||
return ImGui::InputTextDeactivateHook(id);
|
||||
}
|
||||
CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,char* buf,int buf_size,ImGuiInputTextFlags flags)
|
||||
{
|
||||
return ImGui::TempInputText(bb,id,label,buf,buf_size,flags);
|
||||
|
Reference in New Issue
Block a user