Merge branch 'docking_inter'

This commit is contained in:
sonoro1234
2024-05-28 10:18:05 +02:00
9 changed files with 4010 additions and 3810 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.6" 19060 from Dear ImGui https://github.com/ocornut/imgui
//based on imgui.h file version "1.90.7" 19070 from Dear ImGui https://github.com/ocornut/imgui
//with imgui_internal.h api
#ifdef IMGUI_ENABLE_FREETYPE
#ifndef CIMGUI_FREETYPE
@@ -1487,6 +1487,14 @@ CIMGUI_API void igSetNextFrameWantCaptureKeyboard(bool want_capture_keyboard)
{
return ImGui::SetNextFrameWantCaptureKeyboard(want_capture_keyboard);
}
CIMGUI_API bool igShortcut_Nil(ImGuiKeyChord key_chord,ImGuiInputFlags flags)
{
return ImGui::Shortcut(key_chord,flags);
}
CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord,ImGuiInputFlags flags)
{
return ImGui::SetNextItemShortcut(key_chord,flags);
}
CIMGUI_API bool igIsMouseDown_Nil(ImGuiMouseButton button)
{
return ImGui::IsMouseDown(button);
@@ -3858,6 +3866,10 @@ CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags()
{
return ImGui::UpdateHoveredWindowAndCaptureFlags();
}
CIMGUI_API void igFindHoveredWindowEx(const ImVec2 pos,bool find_first_and_in_any_viewport,ImGuiWindow** out_hovered_window,ImGuiWindow** out_hovered_window_under_moving_window)
{
return ImGui::FindHoveredWindowEx(pos,find_first_and_in_any_viewport,out_hovered_window,out_hovered_window_under_moving_window);
}
CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window)
{
return ImGui::StartMouseMovingWindow(window);
@@ -4266,9 +4278,9 @@ CIMGUI_API bool igIsNamedKey(ImGuiKey key)
{
return ImGui::IsNamedKey(key);
}
CIMGUI_API bool igIsNamedKeyOrModKey(ImGuiKey key)
CIMGUI_API bool igIsNamedKeyOrMod(ImGuiKey key)
{
return ImGui::IsNamedKeyOrModKey(key);
return ImGui::IsNamedKeyOrMod(key);
}
CIMGUI_API bool igIsLegacyKey(ImGuiKey key)
{
@@ -4294,13 +4306,13 @@ CIMGUI_API bool igIsModKey(ImGuiKey key)
{
return ImGui::IsModKey(key);
}
CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,ImGuiKeyChord key_chord)
CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiKeyChord key_chord)
{
return ImGui::FixupKeyChord(ctx,key_chord);
return ImGui::FixupKeyChord(key_chord);
}
CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key)
{
return ImGui::ConvertSingleModFlagToKey(ctx,key);
return ImGui::ConvertSingleModFlagToKey(key);
}
CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key)
{
@@ -4378,21 +4390,25 @@ CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id)
{
return ImGui::IsKeyDown(key,owner_id);
}
CIMGUI_API bool igIsKeyPressed_ID(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags)
CIMGUI_API bool igIsKeyPressed_InputFlags(ImGuiKey key,ImGuiInputFlags flags,ImGuiID owner_id)
{
return ImGui::IsKeyPressed(key,owner_id,flags);
return ImGui::IsKeyPressed(key,flags,owner_id);
}
CIMGUI_API bool igIsKeyReleased_ID(ImGuiKey key,ImGuiID owner_id)
{
return ImGui::IsKeyReleased(key,owner_id);
}
CIMGUI_API bool igIsKeyChordPressed_InputFlags(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
{
return ImGui::IsKeyChordPressed(key_chord,flags,owner_id);
}
CIMGUI_API bool igIsMouseDown_ID(ImGuiMouseButton button,ImGuiID owner_id)
{
return ImGui::IsMouseDown(button,owner_id);
}
CIMGUI_API bool igIsMouseClicked_ID(ImGuiMouseButton button,ImGuiID owner_id,ImGuiInputFlags flags)
CIMGUI_API bool igIsMouseClicked_InputFlags(ImGuiMouseButton button,ImGuiInputFlags flags,ImGuiID owner_id)
{
return ImGui::IsMouseClicked(button,owner_id,flags);
return ImGui::IsMouseClicked(button,flags,owner_id);
}
CIMGUI_API bool igIsMouseReleased_ID(ImGuiMouseButton button,ImGuiID owner_id)
{
@@ -4402,21 +4418,13 @@ CIMGUI_API bool igIsMouseDoubleClicked_ID(ImGuiMouseButton button,ImGuiID owner_
{
return ImGui::IsMouseDoubleClicked(button,owner_id);
}
CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
CIMGUI_API bool igShortcut_ID(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
{
return ImGui::IsKeyChordPressed(key_chord,owner_id,flags);
return ImGui::Shortcut(key_chord,flags,owner_id);
}
CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord)
CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiInputFlags flags,ImGuiID owner_id)
{
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);
}
CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
{
return ImGui::SetShortcutRouting(key_chord,owner_id,flags);
return ImGui::SetShortcutRouting(key_chord,flags,owner_id);
}
CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id)
{