mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into 2015-05-menus 

Conflicts:
	imgui.cpp
This commit is contained in:
ocornut 2015-05-24 17:32:10 +01:00
parent 89d1340225 8cfae35042
commit 14bcfef041
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
imgui.cpp
View File

@ -7824,16 +7824,22 @@ void ImGui::Separator()
}
}
// A little vertical spacing.
void ImGui::Spacing()
{
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
return;
ItemSize(ImVec2(0,0));
}
void ImGui::Dummy(const ImVec2& size)
{
ImGuiWindow* window = GetCurrentWindow();
if (window->SkipItems)
return;
ItemSize(size);
}
// Advance cursor given item size for layout.
static void ItemSize(ImVec2 size, float text_offset_y)
{
@ -10847,6 +10853,12 @@ void ImGui::ShowTestWindow(bool* opened)
}
ImGui::PopItemWidth();
// Dummy
ImVec2 sz(30,30);
ImGui::Button("A", sz); ImGui::SameLine();
ImGui::Dummy(sz); ImGui::SameLine();
ImGui::Button("B", sz);
ImGui::TreePop();
}

5
imgui.h
View File

@ -171,11 +171,12 @@ namespace ImGui
IMGUI_API void CloseCurrentPopup();
// Layout
IMGUI_API void BeginGroup();
IMGUI_API void BeginGroup(); // once closing a group it is seen as a single item (so you can use IsItemHovered() on a group, SameLine() between groups, etc.
IMGUI_API void EndGroup();
IMGUI_API void Separator(); // horizontal line
IMGUI_API void SameLine(int column_x = 0, int spacing_w = -1); // call between widgets or groups to layout them horizontally
IMGUI_API void Spacing(); // add vertical spacing
IMGUI_API void Spacing(); // add spacing
IMGUI_API void Dummy(const ImVec2& size); // add a dummy item of given size
IMGUI_API void Indent(); // move content position toward the right by style.IndentSpacing pixels
IMGUI_API void Unindent(); // move content position back to the left (cancel Indent)
IMGUI_API void Columns(int count = 1, const char* id = NULL, bool border=true); // setup number of columns. use an identifier to distinguish multiple column sets. close with Columns(1).