mirror of
https://github.com/Drezil/imgui.git
synced 2024-11-15 01:17:00 +00:00
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
This commit is contained in:
parent
9142002121
commit
f99348711b
87
imgui.cpp
87
imgui.cpp
@ -9879,65 +9879,70 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
|
|||||||
// Horizontal separating line.
|
// Horizontal separating line.
|
||||||
void ImGui::Separator()
|
void ImGui::Separator()
|
||||||
{
|
{
|
||||||
ImGuiContext& g = *GImGui;
|
|
||||||
ImGuiWindow* window = GetCurrentWindow();
|
ImGuiWindow* window = GetCurrentWindow();
|
||||||
if (window->SkipItems)
|
if (window->SkipItems)
|
||||||
return;
|
return;
|
||||||
|
ImGuiContext& g = *GImGui;
|
||||||
|
|
||||||
ImGuiWindowFlags flags = 0;
|
ImGuiWindowFlags flags = 0;
|
||||||
if ((flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)) == 0)
|
if ((flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)) == 0)
|
||||||
{
|
flags |= (window->DC.LayoutType == ImGuiLayoutType_Horizontal) ? ImGuiSeparatorFlags_Vertical : ImGuiSeparatorFlags_Horizontal;
|
||||||
if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
|
|
||||||
flags |= ImGuiSeparatorFlags_Vertical;
|
|
||||||
else
|
|
||||||
flags |= ImGuiSeparatorFlags_Horizontal;
|
|
||||||
}
|
|
||||||
IM_ASSERT(ImIsPowerOfTwo((int)(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)))); // Check that only 1 option is selected
|
IM_ASSERT(ImIsPowerOfTwo((int)(flags & (ImGuiSeparatorFlags_Horizontal | ImGuiSeparatorFlags_Vertical)))); // Check that only 1 option is selected
|
||||||
|
if (flags & ImGuiSeparatorFlags_Vertical)
|
||||||
|
{
|
||||||
|
VerticalSeparator();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (flags & ImGuiSeparatorFlags_Horizontal)
|
// Horizontal Separator
|
||||||
|
if (window->DC.ColumnsCount > 1)
|
||||||
|
PopClipRect();
|
||||||
|
|
||||||
|
float x1 = window->Pos.x;
|
||||||
|
float x2 = window->Pos.x + window->Size.x;
|
||||||
|
if (!window->DC.GroupStack.empty())
|
||||||
|
x1 += window->DC.IndentX;
|
||||||
|
|
||||||
|
const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y+1.0f));
|
||||||
|
ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
|
||||||
|
if (!ItemAdd(bb, NULL))
|
||||||
{
|
{
|
||||||
if (window->DC.ColumnsCount > 1)
|
if (window->DC.ColumnsCount > 1)
|
||||||
PopClipRect();
|
PushColumnClipRect();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
float x1 = window->Pos.x;
|
window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x,bb.Min.y), GetColorU32(ImGuiCol_Separator));
|
||||||
float x2 = window->Pos.x + window->Size.x;
|
|
||||||
if (!window->DC.GroupStack.empty())
|
|
||||||
x1 += window->DC.IndentX;
|
|
||||||
|
|
||||||
const ImRect bb(ImVec2(x1, window->DC.CursorPos.y), ImVec2(x2, window->DC.CursorPos.y+1.0f));
|
if (g.LogEnabled)
|
||||||
ItemSize(ImVec2(0.0f, 0.0f)); // NB: we don't provide our width so that it doesn't get feed back into AutoFit, we don't provide height to not alter layout.
|
|
||||||
if (!ItemAdd(bb, NULL))
|
|
||||||
{
|
|
||||||
if (window->DC.ColumnsCount > 1)
|
|
||||||
PushColumnClipRect();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
window->DrawList->AddLine(bb.Min, ImVec2(bb.Max.x,bb.Min.y), GetColorU32(ImGuiCol_Separator));
|
|
||||||
|
|
||||||
if (g.LogEnabled)
|
|
||||||
LogRenderedText(NULL, IM_NEWLINE "--------------------------------");
|
LogRenderedText(NULL, IM_NEWLINE "--------------------------------");
|
||||||
|
|
||||||
if (window->DC.ColumnsCount > 1)
|
if (window->DC.ColumnsCount > 1)
|
||||||
{
|
|
||||||
PushColumnClipRect();
|
|
||||||
window->DC.ColumnsCellMinY = window->DC.CursorPos.y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (flags & ImGuiSeparatorFlags_Vertical)
|
|
||||||
{
|
{
|
||||||
const ImRect bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(1.0f, window->DC.CurrentLineHeight));
|
PushColumnClipRect();
|
||||||
ItemSize(ImVec2(bb.GetWidth(), 0.0f));
|
window->DC.ColumnsCellMinY = window->DC.CursorPos.y;
|
||||||
if (!ItemAdd(bb, NULL))
|
|
||||||
return;
|
|
||||||
|
|
||||||
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
|
|
||||||
|
|
||||||
if (g.LogEnabled)
|
|
||||||
LogText("|");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ImGui::VerticalSeparator()
|
||||||
|
{
|
||||||
|
ImGuiWindow* window = GetCurrentWindow();
|
||||||
|
if (window->SkipItems)
|
||||||
|
return;
|
||||||
|
ImGuiContext& g = *GImGui;
|
||||||
|
|
||||||
|
float y1 = window->DC.CursorPos.y;
|
||||||
|
float y2 = window->DC.CursorPos.y + window->DC.CurrentLineHeight;
|
||||||
|
const ImRect bb(ImVec2(window->DC.CursorPos.x, y1), ImVec2(window->DC.CursorPos.x + 1.0f, y2));
|
||||||
|
ItemSize(ImVec2(bb.GetWidth(), 0.0f));
|
||||||
|
if (!ItemAdd(bb, NULL))
|
||||||
|
return;
|
||||||
|
|
||||||
|
window->DrawList->AddLine(ImVec2(bb.Min.x, bb.Min.y), ImVec2(bb.Min.x, bb.Max.y), GetColorU32(ImGuiCol_Separator));
|
||||||
|
if (g.LogEnabled)
|
||||||
|
LogText(" |");
|
||||||
|
}
|
||||||
|
|
||||||
void ImGui::Spacing()
|
void ImGui::Spacing()
|
||||||
{
|
{
|
||||||
ImGuiWindow* window = GetCurrentWindow();
|
ImGuiWindow* window = GetCurrentWindow();
|
||||||
|
2
imgui.h
2
imgui.h
@ -209,7 +209,7 @@ namespace ImGui
|
|||||||
IMGUI_API void PopButtonRepeat();
|
IMGUI_API void PopButtonRepeat();
|
||||||
|
|
||||||
// Cursor / Layout
|
// Cursor / Layout
|
||||||
IMGUI_API void Separator(); // horizontal line
|
IMGUI_API void Separator(); // separator, generally horizontal. inside a menu bar or in horizontal layout mode, this becomes a vertical separator.
|
||||||
IMGUI_API void SameLine(float pos_x = 0.0f, float spacing_w = -1.0f); // call between widgets or groups to layout them horizontally
|
IMGUI_API void SameLine(float pos_x = 0.0f, float spacing_w = -1.0f); // call between widgets or groups to layout them horizontally
|
||||||
IMGUI_API void NewLine(); // undo a SameLine()
|
IMGUI_API void NewLine(); // undo a SameLine()
|
||||||
IMGUI_API void Spacing(); // add vertical spacing
|
IMGUI_API void Spacing(); // add vertical spacing
|
||||||
|
@ -789,6 +789,8 @@ namespace ImGui
|
|||||||
|
|
||||||
IMGUI_API int CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate);
|
IMGUI_API int CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate);
|
||||||
|
|
||||||
|
IMGUI_API void VerticalSeparator(); // Vertical separator, for menu bars (use current line height). not exposed because it is misleading what it doesn't have an effect on regular layout.
|
||||||
|
|
||||||
// FIXME-WIP: New Columns API
|
// FIXME-WIP: New Columns API
|
||||||
IMGUI_API void BeginColumns(const char* id, int count, ImGuiColumnsFlags flags = 0); // setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns().
|
IMGUI_API void BeginColumns(const char* id, int count, ImGuiColumnsFlags flags = 0); // setup number of columns. use an identifier to distinguish multiple column sets. close with EndColumns().
|
||||||
IMGUI_API void EndColumns(); // close columns
|
IMGUI_API void EndColumns(); // close columns
|
||||||
|
Loading…
Reference in New Issue
Block a user