kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-16 14:28:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

update to imgui 1.49

Browse Source
This commit is contained in:
Stephan Dilly
2016-06-05 13:19:34 +02:00
parent 00a9d14f34
commit b647142cf5
5 changed files with 164 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
cimgui/cimgui.cpp
View File

@@ -164,6 +164,11 @@ CIMGUI_API void igSetNextWindowSize(CONST ImVec2 size, ImGuiSetCond cond)
ImGui::SetNextWindowSize(size, cond);
}
CIMGUI_API void igSetNextWindowSizeConstraints(CONST struct ImVec2 size_min, CONST struct ImVec2 size_max, ImGuiSizeConstraintCallback custom_callback, void* custom_callback_data)
{
ImGui::SetNextWindowSizeConstraints(size_min, size_max, custom_callback, custom_callback_data);
}
CIMGUI_API void igSetNextWindowContentSize(CONST ImVec2 size)
{
ImGui::SetNextWindowContentSize(size);
@@ -421,9 +426,9 @@ CIMGUI_API bool igBeginPopup(CONST char* str_id)
return ImGui::BeginPopup(str_id);
}
CIMGUI_API bool igBeginPopupModal(CONST char* name, bool* p_opened, ImGuiWindowFlags extra_flags)
CIMGUI_API bool igBeginPopupModal(CONST char* name, bool* p_open, ImGuiWindowFlags extra_flags)
{
return ImGui::BeginPopupModal(name, p_opened, extra_flags);
return ImGui::BeginPopupModal(name, p_open, extra_flags);
}
CIMGUI_API bool igBeginPopupContextItem(CONST char* str_id, int mouse_button)
@@ -452,15 +457,6 @@ CIMGUI_API void igCloseCurrentPopup()
}
// Layout
CIMGUI_API void igBeginGroup()
{
return ImGui::BeginGroup();
}
CIMGUI_API void igEndGroup()
{
return ImGui::EndGroup();
}
CIMGUI_API void igSeparator()
{
@@ -472,6 +468,11 @@ CIMGUI_API void igSameLine(float pos_x, float spacing_w)
return ImGui::SameLine(pos_x, spacing_w);
}
CIMGUI_API void igNewLine()
{
return ImGui::NewLine();
}
CIMGUI_API void igSpacing()
{
return ImGui::Spacing();
@@ -482,14 +483,24 @@ CIMGUI_API void igDummy(CONST ImVec2* size)
return ImGui::Dummy(*size);
}
CIMGUI_API void igIndent()
CIMGUI_API void igIndent(float indent_w)
{
return ImGui::Indent();
return ImGui::Indent(indent_w);
}
CIMGUI_API void igUnindent()
CIMGUI_API void igUnindent(float indent_w)
{
return ImGui::Unindent();
return ImGui::Unindent(indent_w);
}
CIMGUI_API void igBeginGroup()
{
return ImGui::BeginGroup();
}
CIMGUI_API void igEndGroup()
{
return ImGui::EndGroup();
}
CIMGUI_API void igGetCursorPos(ImVec2* pOut)
@@ -752,11 +763,6 @@ CIMGUI_API bool igImageButton(ImTextureID user_texture_id, CONST ImVec2 size, CO
return ImGui::ImageButton(user_texture_id, size, uv0, uv1, frame_padding, bg_col, tint_col);
}
CIMGUI_API bool igCollapsingHeader(CONST char* label, CONST char* str_id, bool display_frame, bool default_open)
{
return ImGui::CollapsingHeader(label, str_id, display_frame, default_open);
}
CIMGUI_API bool igCheckbox(CONST char* label, bool* v)
{
return ImGui::Checkbox(label, v);
@@ -997,9 +1003,9 @@ CIMGUI_API bool igInputInt4(CONST char* label, int v[4], ImGuiInputTextFlags ext
// Widgets: Trees
CIMGUI_API bool igTreeNode(CONST char* str_label_id)
CIMGUI_API bool igTreeNode(CONST char* label)
{
return ImGui::TreeNode(str_label_id);
return ImGui::TreeNode(label);
}
CIMGUI_API bool igTreeNodeStr(CONST char* str_id, CONST char* fmt, ...)
@@ -1032,6 +1038,41 @@ CIMGUI_API bool igTreeNodePtrV(CONST void* ptr_id, CONST char* fmt, va_list args
return ImGui::TreeNodeV(ptr_id, fmt, args);
}
CIMGUI_API bool igTreeNodeEx(CONST char* label, ImGuiTreeNodeFlags flags)
{
return ImGui::TreeNodeEx(label, flags);
}
CIMGUI_API bool igTreeNodeExStr(CONST char* str_id, ImGuiTreeNodeFlags flags, CONST char* fmt, ...)
{
va_list args;
va_start(args, fmt);
bool res = ImGui::TreeNodeExV(str_id, flags, fmt, args);
va_end(args);
return res;
}
CIMGUI_API bool igTreeNodeExPtr(CONST void* ptr_id, ImGuiTreeNodeFlags flags, CONST char* fmt, ...)
{
va_list args;
va_start(args, fmt);
bool res = ImGui::TreeNodeExV(ptr_id, flags, fmt, args);
va_end(args);
return res;
}
CIMGUI_API bool igTreeNodeExV(CONST char* str_id, ImGuiTreeNodeFlags flags, CONST char* fmt, va_list args)
{
return ImGui::TreeNodeExV(str_id,flags,fmt,args);
}
CIMGUI_API bool igTreeNodeExVPtr(CONST void* ptr_id, ImGuiTreeNodeFlags flags, CONST char* fmt, va_list args)
{
return ImGui::TreeNodeExV(ptr_id,flags,fmt,args);
}
CIMGUI_API void igTreePushStr(CONST char* str_id)
{
return ImGui::TreePush(str_id);
@@ -1047,9 +1088,29 @@ CIMGUI_API void igTreePop()
return ImGui::TreePop();
}
CIMGUI_API void igSetNextTreeNodeOpened(bool opened, ImGuiSetCond cond)
CIMGUI_API void igTreeAdvanceToLabelPos()
{
return ImGui::SetNextTreeNodeOpened(opened, cond);
return ImGui::TreeAdvanceToLabelPos();
}
CIMGUI_API float igGetTreeNodeToLabelSpacing()
{
return ImGui::GetTreeNodeToLabelSpacing();
}
CIMGUI_API void igSetNextTreeNodeOpen(bool opened, ImGuiSetCond cond)
{
return ImGui::SetNextTreeNodeOpen(opened, cond);
}
CIMGUI_API bool igCollapsingHeader(CONST char* label, ImGuiTreeNodeFlags flags)
{
return ImGui::CollapsingHeader(label, flags);
}
CIMGUI_API bool igCollapsingHeaderEx(CONST char* label, bool* p_open, ImGuiTreeNodeFlags flags)
{
return ImGui::CollapsingHeader(label,p_open,flags);
}
// Widgets: Selectable / Lists
@@ -1196,6 +1257,16 @@ CIMGUI_API void igLogText(CONST char* fmt, ...)
ImGui::LogText("%s",buffer);
}
CIMGUI_API void igPushClipRect(CONST struct ImVec2 clip_rect_min, CONST struct ImVec2 clip_rect_max, bool intersect_with_current_clip_rect)
{
return ImGui::PushClipRect(clip_rect_min, clip_rect_max, intersect_with_current_clip_rect);
}
CIMGUI_API void igPopClipRect()
{
return ImGui::PopClipRect();
}
// Utilities
CIMGUI_API bool igIsItemHovered()
{
@@ -1212,6 +1283,11 @@ CIMGUI_API bool igIsItemActive()
return ImGui::IsItemActive();
}
CIMGUI_API bool igIsItemClicked(int mouse_button)
{
return ImGui::IsItemClicked(mouse_button);
}
CIMGUI_API bool igIsItemVisible()
{
return ImGui::IsItemVisible();
@@ -1267,6 +1343,11 @@ CIMGUI_API bool igIsRootWindowOrAnyChildFocused()
return ImGui::IsRootWindowOrAnyChildFocused();
}
CIMGUI_API bool igIsRootWindowOrAnyChildHovered()
{
return ImGui::IsRootWindowOrAnyChildHovered();
}
CIMGUI_API bool igIsRectVisible(CONST ImVec2 item_size)
{
return ImGui::IsRectVisible(item_size);
@@ -1461,19 +1542,24 @@ CIMGUI_API CONST char* igGetVersion()
return ImGui::GetVersion();
}
CIMGUI_API void* igGetInternalState()
CIMGUI_API ImGuiContext* igCreateContext(void* (*malloc_fn)(size_t), void (*free_fn)(void*))
{
return ImGui::GetInternalState();
return ImGui::CreateContext(malloc_fn,free_fn);
}
CIMGUI_API size_t igGetInternalStateSize()
CIMGUI_API void igDestroyContext(ImGuiContext* ctx)
{
return ImGui::GetInternalStateSize();
return ImGui::DestroyContext(ctx);
}
CIMGUI_API void igSetInternalState(void* state, bool construct)
CIMGUI_API ImGuiContext* igGetCurrentContext()
{
ImGui::SetInternalState(state, construct);
return ImGui::GetCurrentContext();
}
CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
{
return ImGui::SetCurrentContext(ctx);
}
CIMGUI_API void ImGuiIO_AddInputCharacter(unsigned short c)